Make fuzzyclock code more concise.

Also use % formatting instead of string replace.
Translation files updated accordingly.

32 files changed, 65031 insertions, 54691 deletions

diff --git a/po/be.po b/po/be.po
index ce3d867f4..0bd728bd6 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,14 +1,14 @@
 # Беларускі пераклад Gajim
 # Copyright (C) 2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as Gajim.
-# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006.
 #
+# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-20 00:01+0300\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:42+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgid "_Add Contact..."
 msgstr "_Дадаць чалавека..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Пошук сервісаў"
 
@@ -63,7 +63,7 @@ msgid "_Personal Events"
 msgstr "Асабістыя звесткі"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Пачаць размову"
@@ -98,68 +98,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сервераў (напр., "
-"транспарты MSN, ICQ)"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Аўтарызацыя"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Злучыцца па націску кнопкі \"Скончыць\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Стварэнне рахунка"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Я ўжо маю патрэбны рахунак"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Кіраванне..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Проксі:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Захоўваць па_роль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Здольнасці сервера"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Абнавіць профіль па злучэнні"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Адмысловы вузел / порт"
 
@@ -172,31 +169,32 @@ msgstr ""
 "сеткі Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Ваш JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Адмысловыя"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Скончыць"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Назва вузла: "
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Пароль:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Порт:"
 
@@ -204,11 +202,6 @@ msgstr "_Порт:"
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Імя карыстальніка:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -217,18 +210,16 @@ msgstr "<b>Рознае</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Асабістыя звесткі</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Рахунак"
 
@@ -237,24 +228,23 @@ msgid "Account Modification"
 msgstr "Змяненне рахунка"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Спіс адміністратараў"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Аўтаматычна перадалучацца, калі знікае злучэнне"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Злучацца па старце Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "З_мяніць пароль"
 
@@ -271,37 +261,35 @@ msgstr ""
 "да сервера, а гэтая опцыя адключыць выкарыстанне TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Выберыце _ключ..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Пстрыкніце, каб змяніць пароль рахунка"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Злучэнне"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Змяніць асабістыя звесткі..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -309,17 +297,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Агульная"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Назва вузла: "
 
@@ -342,7 +327,6 @@ msgstr ""
 "для запэўнівання сервера ў Вашым існаванні"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -352,7 +336,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -362,7 +345,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -377,43 +359,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Ніякі"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Асабістыя звесткі"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Порт: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Прыяры_тэт:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -424,7 +408,7 @@ msgstr ""
 "атрымлівае гэтыя падзеі"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Прыярытэт будзе змяняцца згодна з станам."
 
@@ -433,12 +417,12 @@ msgid "Proxy:"
 msgstr "Проксі:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Рэ_сурс:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -452,30 +436,25 @@ msgstr ""
 "накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Захоўваць _пароль (небяспечна)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Захоўваць _журналы размоў з усімі людзьмі"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Адпраўляць праверачныя пакункі серверу"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "С_інхранізаваць стан рахунка з глабальным станам"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -486,21 +465,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Ужыць _SSL (састарэлая опцыя)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Ужыць проксі для перадачы файлаў"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Адпаведна стану"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Імя:"
 
@@ -509,31 +483,38 @@ msgstr "_Імя:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Уласцівасці</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Адпаведна стану"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Рахункі"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Аўтарызацыя"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Злучацца па старце Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Уключыць"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Імя:"
 
@@ -543,7 +524,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -553,56 +533,96 @@ msgstr ""
 "Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Прозвішча:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Аб'яднаць рахункі"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Змяніць імя"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Адпраўляць праверачныя пакункі серверу"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "С_інхранізаваць стан рахунка з глабальным станам"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Адмысловы вузел / порт"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Адмысловы порт:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Змяніць асабістыя звесткі..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Уключыць"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Назва вузла: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Кіраванне..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Порт:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "Р_ахунак:"
@@ -790,7 +810,7 @@ msgid "All statuses"
 msgstr "Усе станы"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Сышоў"
 
@@ -807,7 +827,7 @@ msgid "Have "
 msgstr "Мае "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Нябачны"
 
@@ -816,7 +836,7 @@ msgid "Launch a command"
 msgstr "Выканаць загад"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Мяне няма"
 
@@ -937,7 +957,7 @@ msgstr "Апошняя змена:"
 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 +1005,21 @@ msgstr "Увядзіце новы пароль:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Увядзіце тэкст новага паведамлення аб змене стану</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Актывізаваны"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Пакой:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Стандартныя паведамленні:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Захаваць тлумачэнне..."
 
@@ -1052,11 +1082,11 @@ msgstr "_Дадаць у кантактны ліст"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1166,7 +1196,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Працягнуць"
 
@@ -1202,7 +1232,7 @@ msgstr ""
 "Шэраг людзей\n"
 "Банер размовы"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Тлусты"
 
@@ -1222,11 +1252,11 @@ msgstr "Настаўленне тэмы Gajim"
 msgid "Gone"
 msgstr "Знік"
 
-#: ../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 "Неактыўны"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Нахілены"
 
@@ -1277,7 +1307,7 @@ msgstr "Змяніць _тэму"
 msgid "Configure _Room..."
 msgstr "Настаўленні _пакоя"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Змясціць у закладках"
@@ -1312,23 +1342,37 @@ msgstr "_Адміністратар"
 msgid "_Ban"
 msgstr "_Забараніць казанне"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Выкінуць"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Удзельнік"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Уладальнік"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "Ад_правіць прыватнае паведамленне"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Голас"
 
@@ -1336,13 +1380,13 @@ msgstr "_Голас"
 msgid "Create new post"
 msgstr "Стварыць новы допіс"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Ад"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Тэма"
 
@@ -1367,7 +1411,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim - Кіраўнік журналаў размоў"
 
-#: ../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 "Выдаліць"
 
@@ -1392,7 +1437,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Пошук у базе дадзеных"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Журнал размоў"
 
@@ -1413,7 +1458,7 @@ msgstr "Пошук"
 msgid "_Log conversation history"
 msgstr "_Весці журнал размоў"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
@@ -1440,8 +1485,8 @@ msgstr "Нядаўна:"
 msgid "Room:"
 msgstr "Пакой:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Далучыцца"
 
@@ -1471,7 +1516,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Стан друку:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1506,32 +1551,51 @@ msgstr "<b>Настаўленні</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "Злучэнне HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Кіраванне профілямі проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Імя:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Па_роль:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Тып:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Проксі:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Аўтарызацыя"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Порт:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Вузел:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "С_карыстаць проксі"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Аўтарызацыя"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_Спасылка:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Тып:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Імя карыстальніка:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1571,17 +1635,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "Ад_правіць"
 
@@ -1687,10 +1756,14 @@ msgstr ""
 "Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Запытацца аб паведамленні змены стану, калі я:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1704,23 +1777,23 @@ msgstr ""
 "Заўсёды карыстацца праграмамі, прызначанымі ў KDE\n"
 "Адмысловы"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-"
 "праграмай"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Настаўленні колераў і шрыфтаў"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1729,34 +1802,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Паказаць _падрабязнасці пошты"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Паказваць _стан у галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1765,7 +1838,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце ведаць."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1774,7 +1847,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце паведамляць суразмоўцу."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1782,12 +1855,12 @@ msgstr ""
 "Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым "
 "верхнім куце экрана"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1796,7 +1869,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1804,18 +1877,18 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1823,7 +1896,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1831,7 +1904,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
 "кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1839,7 +1912,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1847,7 +1920,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1855,14 +1928,14 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1874,14 +1947,14 @@ msgstr ""
 "зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа "
 "адправіць Вам паведамленне"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1890,7 +1963,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1900,13 +1973,13 @@ msgstr ""
 "пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
 "адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1914,67 +1987,79 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim заменіць ascii-сымболікі (напр., ':)' ) "
 "адпаведнай значкай"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Вакно для аднаго паведамлення:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Кі_раванне..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Змяненне рахунка"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Паведамляць аб новай пошце на _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Граць _гук"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Уласцівасці"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Паказваць падзею ў прасторы паведамленняў"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Злучыцца"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "З_ысці"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1982,148 +2067,152 @@ msgstr ""
 "Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі "
 "гэтая опцыя ўключаная, Gajim будзе паказваць нефарматаваны тэкст."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Упарадкаваць людзей па стане"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Прадвызначаны набор _значак стану:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Марнаванне часу"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "Т_эма:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Ужыць _значкі транспартаў"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Ужыць _сістэмны"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Па атрыманні новай падзеі"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Гартач:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Сымболікі:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Кіраўнік файлаў:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Фарбаваць няправільна напісаныя словы"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ігнараваць афармленне ўваходных паведамленняў"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Уваходнае паведамленне:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Паштовая праграма:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Выходнае паведамленне:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Вярнуць звычайныя колеры"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Няма ў спісе"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "хвіліны"
 
@@ -2171,7 +2260,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
@@ -2241,127 +2330,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Адмысловы</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Гукі</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Аддзел:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Дадатковы адрас:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Прозвішча:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Адмысловы</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "У Сеціве:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Дадаць правіла</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Адмысловы</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Мянушка:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Тэлефонны нумар:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Умовы</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Паштовы індэкс:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Уласцівасці</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Гукі</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Настаўленні</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Настаўленні</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Гукі</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Пра мяне"
 
@@ -2371,17 +2460,17 @@ msgstr "Пстрыкніце, каб вызначыць свой аватар"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Фармат: ГГГГ-ММ-ДД"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Асабістыя звесткі"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Праца"
 
@@ -2399,8 +2488,8 @@ msgstr "Выдаліць рахунак для Gajim і на _серверы"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "Вы_даліць"
 
@@ -2425,14 +2514,14 @@ msgstr "Змяніць _групы"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Выканаць загад..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "За_прасіць"
 
@@ -2443,7 +2532,7 @@ msgstr "Вы_даліць"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Адправіць асаблівы XML"
@@ -2470,12 +2559,6 @@ msgstr "Пачаць _размову"
 msgid "_Allow him/her to see my status"
 msgstr "Дазволіць чалавеку _бачыць змены майго стану"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Забараніць праглядаць змены майго стану"
@@ -2499,17 +2582,35 @@ msgstr "Змяніць _імя"
 msgid "_Subscription"
 msgstr "П_адпіска"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "дзевяць"
 
+#: ../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 "Выдаліць"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2537,59 +2638,64 @@ msgid "Profile, A_vatar"
 msgstr "Профіль, а_ватар"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Паказаць _адлучаных людзей"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Паказаць _транспарты"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Паказаць _галоўнае вакно"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Рахункі"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Дзеянні"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Змест"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_Частыя пытанні"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Настаўленні"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Выйсці"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Адправіць _асобнае паведамленне..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Выгляд"
 
@@ -2608,12 +2714,12 @@ msgid "_Add contact"
 msgstr "Дадаць _чалавека"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "П_ошук"
 
@@ -2699,10 +2805,6 @@ msgstr "Запыт падпіскі"
 msgid "_Deny"
 msgstr "_Адмовіць"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2728,10 +2830,6 @@ msgstr "Адправіць _асобнае паведамленне"
 msgid "Show All Pending _Events"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Паказаць _галоўнае вакно"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Ст_ан"
@@ -2751,55 +2849,60 @@ msgstr "<b>Дзеянні</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Настаўленні</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Рэсурс:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Настаўленні</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Апісанне</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Каментарыі"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Настаўленні _пакоя"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Чалавек"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Яшчэ"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Аватар:"
@@ -2812,6 +2915,11 @@ msgstr "<b>Трафік Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Увод XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Уключыць"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2840,13 +2948,13 @@ msgstr "Прызначыць ключ Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Змяніць _групы"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "Змяніць _імя"
 
@@ -2870,30 +2978,26 @@ msgstr "Рэсурс:"
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Змяніць рахунак"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Асабістыя звесткі"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2918,7 +3022,7 @@ msgstr "Цэлы лік"
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Колер"
 
@@ -2943,226 +3047,263 @@ msgstr "(Няма)"
 msgid "Hidden"
 msgstr "Схаваны"
 
+#: ../src/atom_window.py:110
+#, fuzzy, 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Ангельская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Беларуская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Балгарская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Breton"
 msgstr "Брытонская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Чэшская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Грэцкая"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Брытанская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Эсперанта"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Іспанская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Basque"
 msgstr "Басцкая"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Французская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Харвацкая"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Італійская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Нарвежская (бокмал)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Галандская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Нарвежская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Польская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Партугальская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Бразільская партугальская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Расейская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Нямецкая"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Славацкая"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Шведская"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "дзевяць"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Мянушка"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Шрыфт:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Асабістыя звесткі"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Няма ў спісе"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" выконвае %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групавой размовы %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
@@ -3170,33 +3311,33 @@ msgstr "Аўтарызацыя"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Загады: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Карыстанне: /%s, прыбірае тэкст у вакне."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3205,66 +3346,66 @@ msgstr ""
 "Карыстанне: /%s <дзеянне>, выконвае дзеянне ў групавой размове (ад трэцяй "
 "асобы). (напр., /%s рагоча як конь.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Карыстанне: /%s, хавае кнопкі размовы."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Даведка па /%s адсутнічае"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3272,182 +3413,194 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 сканчвае работу"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "стварэнне дырэкторыі %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Змяніць звесткі аб стане"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Змяніць стан"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Выставіць тып прысутнасці і апісанне"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Вольны для размовы"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "У сетцы"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Пашыраны рэжым адсутнасці"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Не турбаваць"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Адлучаны - па-за сеткай"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Апісанне прысутнасці:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Стан змяніўся."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Сысці з групавых размоў"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s на %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Выберыце групавыя размовы, з якіх Вы хочаце сысці"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Групавыя размовы"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Вы сышлі з наступных групавых размоў:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d нечытанае паведамленне"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Паказваць нагадванні праз DBus і Notification-Daemon"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Праз колькі хвілінаў змяняць стан на сышоўшы."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Сышоў як вынік марнавання часу"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Праз колькі хвілінаў змяняць стан на недаступны."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Недаступны ў выніку марнавання часу"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Дазволіць мясцовыя паведамленні"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Мова правапісу"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3457,7 +3610,7 @@ msgstr ""
 "'sometimes' - паказваць час кожныя print_ichat_every_foo_minutes хвілінаў.\n"
 "'never' - не паказваць час."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3468,18 +3621,18 @@ msgstr ""
 "паказвае самы прыблізны. Працуе, калі опцыя print_time мае значэнне "
 "'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Лічыць спалучэнні * / _  мажлівымі знакамі фарматавання."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Калі true, не выдаляць */_ . Такім чынам, *abc* будзе тлустым, але * * не "
 "выдаляецца."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3490,19 +3643,19 @@ msgstr ""
 "сінтаксіс на http://docutils.sourceforge.net/docs/ref/rst/restructuredtext."
 "html (калі Вы хочаце ўжыць гэтую магчымасць, усталюйце docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "Знак пасля дапоўненай мянушкі ў групавой размове."
 
-#: ../src/common/config.py:138
+#: ../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."
 msgstr "Знак пасля вызначанай мянушкі, калі яе згадваюць у групавой размове."
 
-#: ../src/common/config.py:161
+#: ../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 "
@@ -3514,30 +3667,30 @@ msgstr ""
 "дакументацыі для python на функцыю strftime: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Знакі, якія друкуюцца ў вокнах размовы перад мянушкай"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Знакі, якія друкуюцца ў вокнах размовы пасля мянушкі"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Дадаць * і [n] у назву галоўнага вакна?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 "Колькі радкоў помніць з апошняй размовы, калі размова наноў адкрываецца."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колькі хвілінаў апошняй размовы паказваць у новых размовах."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3545,11 +3698,11 @@ msgstr ""
 "Адпраўляць паведамленне праз Ctrl+Enter, а Enter стварае новы радок "
 "(стандартныя паводзіны Mirabilis ICQ)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колькі радкоў захоўваць для Ctrl+KeyUP."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3558,13 +3711,13 @@ msgstr ""
 "Альбо адмысловы адрас з %s, дзе %s ёсць словам/выразам, альбо 'WIKTIONARY', "
 "што значыць выкарыстанне Вікі-Слоўніка."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim можа кантралявацца з дапамогай gajim-"
 "remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3575,14 +3728,14 @@ msgstr ""
 "(для якіх опцыя listen_to_network_manager не выстаўленая ў False і якія "
 "сінхранізуюцца з глабальным станам) згодна з станам сеткавага злучэння."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Адпраўляць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3590,7 +3743,7 @@ msgstr ""
 "Паказваць паведамленні аб стане размовы. Адно з наступных значэнняў: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3598,11 +3751,11 @@ msgstr ""
 "Калі трэба паказваць час не для кожнага паведамлення "
 "(print_time==sometimes), паказваць яго кожныя x хвілінаў."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Пытацца пацверджання закрыцця групавой размовы."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3610,7 +3763,7 @@ msgstr ""
 "Заўсёды пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3618,7 +3771,13 @@ msgstr ""
 "Ніколі не пытацца пацверджання закрыцця групавых размоў з гэтага спіса "
 "падзеленых прагаламі назваў групавых размоў."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3627,33 +3786,27 @@ msgstr ""
 "Вызначае вузел, якому мы адпраўляем файлы, у выпадку трансляцыі адрасоў / "
 "перанакіравання портаў."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "У стандарце IEC вызначана, што КіБ = 1024 байтаў, КБ = 1000 байтаў."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Нагадваць аб падзеях праз значку прасторы паведамленняў."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Паказваць картку, калі актыўная толькі адна размова?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Паказваць межы картак у вокнах размовы?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Паказваць кнопку закрыцця на картцы?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3661,18 +3814,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Спіс падзеленых кропкай з коскай слоў, якія трэба фарбаваць у групавых "
 "размовах."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3680,14 +3833,14 @@ msgstr ""
 "Калі true, Gajim сканчвае работу па націску кнопкі X вакна. Гэтае "
 "настаўленне ўлічваецца толькі разам з значкай прасторы паведамленняў."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Калі true, Gajim будзе пры запуску спраўджваць, ці з'яўляецца ён "
 "прадвызначанай Jabber-праграмай."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3695,17 +3848,17 @@ msgstr ""
 "Калі true, Gajim паказвае значку на кожнай картцы з нечытанымі "
 "паведамленнямі. У залежнасці ад тэмы, гэтая значка можа быць і анімаванай."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 msgstr "Калі true, Gajim паказвае стан у галоўным вакне для кожнага чалавека"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3714,13 +3867,13 @@ msgstr ""
 "чалавеку, хто не меў усталяванага аватара ў апошні сеанс, ці чый аватар "
 "надта стары."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3734,30 +3887,30 @@ msgstr ""
 "паказваць усе такія паведамленні. Калі опцыя выстаўленая ў \"in_and_out\", "
 "Gajim будзе паказваць толькі паведамленні аб сыходзе / ўваходзе суразмоўцы."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Фонавы колер для толькі сышоўшых людзей."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Калі true, адноўленыя з папярэдняга сеанса паведамленні будуць мець меншы "
 "памер шрыфта."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Не паказваць аватар для транспарта."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3767,7 +3920,7 @@ msgstr ""
 "вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
 "нягледжаных падзей."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3778,7 +3931,7 @@ msgstr ""
 "перастаць адпраўляць звесткі sha у групавыя размовы"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3798,32 +3951,32 @@ msgstr ""
 "адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
 "пасля перазапуску праграмы."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Калі true, клавіша Escape закрывае картку / вакно."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Хавае банер у групавой размове"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Хавае банер у прыватнай размове"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3831,28 +3984,28 @@ msgstr ""
 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
 "напісаў той самы чалавек."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Адправіць паведамленне і закрыць вакно"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Спіс колераў для фарбавання мянушак у групавой размове."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3860,7 +4013,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:256
+#: ../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 "
@@ -3870,7 +4023,7 @@ msgstr ""
 "Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
 "ад Вашага сервера."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3878,7 +4031,16 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
+"пароляў Gnome Keyring (калі ўсталяваны)."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3886,7 +4048,7 @@ msgstr ""
 "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
 "людзей і агульную колькасць у радках групаў і рахункаў."
 
-#: ../src/common/config.py:259
+#: ../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"
@@ -3894,51 +4056,57 @@ msgstr ""
 "Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то "
 "лічыць усе ўваходныя паведамленні гэтага тыпу"
 
-#: ../src/common/config.py:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../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 separately)"
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"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:278
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3946,60 +4114,68 @@ msgstr ""
 "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
 "опцыях autopriority_*."
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4007,119 +4183,125 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "усе ці падзеленыя прагаламі станы"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ці 'both'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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' ці ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Сон"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Ежа"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Фільм"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Працую"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Працую."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Сышоў"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4128,148 +4310,178 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "садавіна"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "чалавек"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "мора"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Няправільны вузел"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Зарэгістравацца на %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Памылка злучэння"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Няправільны Jabber ID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Такая мянушка не дазволеная: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Немагчыма ўвайсці ў групавую размову"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас няма ў спісе ўдзельнікаў."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "цяпер падпісаны на %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запыт адпіскі ад %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "цяпер адпісаны ад %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4280,247 +4492,252 @@ msgstr ""
 "org/"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Пароль OpenPGP не вызначаны"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Памылка злучэння"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Захаваць у: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Памылка злучэння"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Праверце злучэнне альбо паспрабуйце пазней"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4529,26 +4746,31 @@ msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Немагчыма адправіць пусты файл"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4557,19 +4779,30 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Людзі"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Назіральнікі"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Транспарты"
 
@@ -4578,11 +4811,11 @@ msgid "Not in roster"
 msgstr "Няма ў спісе"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Файлы падтрымкі python для D-Bus адсутнічаюць на гэтым кампутары"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Немагчыма скарыстаць D-Bus для Gajim"
 
@@ -4612,356 +4845,356 @@ msgstr ""
 "Шына сеанса недаступная.\n"
 "Чытайце http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "дванаццаць"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "адзін"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "два"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "тры"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "чатыры"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "пяць"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "шэсць"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "сем"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "восем"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "дзевяць"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "дзесяць"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "адзінаццаць"
 
+#. 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 "дванаццаць"
+msgid "%(0)s o'clock"
+msgstr "%(0)s гадзінаў"
 
-#. 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 гадзінаў"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "пяць хвілінаў на $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "пяць хвілінаў на %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "дзесяць хвілінаў на $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "дзесяць хвілінаў на %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "чвэрць на $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "чвэрць на %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "дваццаць хвілінаў на $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "дваццаць хвілінаў на %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "дваццаць пяць хвілінаў на $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "дваццаць пяць хвілінаў на %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "палова на $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "палова на %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "без дваццаці пяці хвілінаў $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "без дваццаці пяці хвілінаў %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "без дваццаці хвілінаў $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "без дваццаці хвілінаў %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "без чвэрці $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "без чвэрці %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
 msgstr "дзесяць хвілінаў на $s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "без пяці хвілінаў $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "без пяці хвілінаў %(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 "Ноч"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Світанак"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Раніца"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Амаль дзень"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Полудзень"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Абед"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Вечар"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Позні вечар"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Пачатак тыдня"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Сярэдзіна тыдня"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Канец тыдня"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Няправільны знак у імені карыстальніка."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Патрэбны адрас сервера."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Няправільны знак у назве вузла."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s ГіБ"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s ГБ"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s МіБ"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s МБ"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s кiБ"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s кБ"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s Б"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Тут"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Тут"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Адключаны"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Да"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Абодва"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "піша паведамленне..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s ГіБ"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s ГБ"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s МіБ"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s МБ"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s кiБ"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s кБ"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s Б"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4969,22 +5202,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4992,754 +5225,759 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "памылка: немагчыма прачытаць %s"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Рахунак Gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "рахунка %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Прыпынена"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Тлусты"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Мае "
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Размовы"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Тлусты"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Змест"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Скончаная"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Змест"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Неактывізаваны"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "спасылка"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Выдаліць"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Адключана"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Адключана"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Адключана"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Excited"
 msgstr "Актывізаваны"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Група"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Вузел:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "паведамленне"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Актывізаваны"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Нябачны"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "адзін"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Вузел:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Нямецкая"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Змяніць"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Адключаны"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Група"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "адзінаццаць"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Марнаванне часу"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Апошняя змена:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Мянушка"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Сон"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Вуліца:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Падпісаны"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Час"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "дзевяць"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Няправільны вузел"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Вечар"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Піша"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Раніца"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "усе з групы"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Вечар"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Пакаранне %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Далучыцца"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Працую"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Працую"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "пакой"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Змяненне тэмы"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Пакаранне %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Пакаранне %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "З_ысці"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Прычына"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Прычына"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Сон"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Гляджу фільм."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Ежа"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Я на тэлефоне."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Перадача"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Піша"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "On a Plane"
 msgstr "У сетцы"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Працую"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Піша"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Працую"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Немагчыма адкрыць порт %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
 msgstr "Магчыма, Gajim ужо працуе. Перадача файлаў скасаваная."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5748,16 +5986,16 @@ msgstr ""
 "Вузел, вызначаны опцыяй ft_override_host_to_send, некарэктны, таму "
 "ігнаруецца."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Каб працягваць адпраўку і атрыманне паведамленняў, трэба перадалучыцца."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Памылка Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5766,32 +6004,32 @@ msgstr ""
 "%s\n"
 "Мясцовыя паведамленні могуць не працаваць."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Праверце, ці ўсталяваны Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Немагчыма стартаваць мясцовы сервіс"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Немагчыма злучыцца праз порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Немагчыма змяніць стан рахунка \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5799,63 +6037,51 @@ msgstr ""
 "Вы не злучаны альбо не бачны для іншых. Вы не можаце адправіць паведамленне."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Чалавека пакуль няма. Вы не можаце адправіць паведамленне."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Немагчыма злучыцца з вузлом: скончыўся тэрмін чакання."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Памылка дадання сервіса. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Адключана"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Актыўны"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Падзея"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Стандартныя паведамленні стану"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Адмысловы</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5864,251 +6090,209 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Атрыманае першае паведамленне"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Атрыманае наступнае паведамленне"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Атрыманае наступнае паведамленне"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Чалавек далучыўся"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Чалавек адлучыўся"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Паведамленне адпраўленае"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Фарбаванае паведамленне ў групавой размове"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Новае паведамленне ў групавой размове"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Новы ліст GMail"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Назва"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Кіраванне рахункамі"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Няправільны Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Вы не злучаны з серверам"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6116,11 +6300,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6128,11 +6312,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6140,11 +6324,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6152,14 +6336,15 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Мажлівыя варыянты:\n"
 "1. user@domain/resource (толькі гэты рэсурс).\n"
@@ -6168,85 +6353,90 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr ""
-"Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
-"рахунка."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Такая мянушка не дазволеная: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Паўторны Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Гэты рахунак ужо выкарыстоўваецца ў Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Няправільны элемент"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6256,27 +6446,36 @@ msgstr ""
 "\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
 "\" галоўнага вакна."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Новы рахунак паспяхова створаны"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr ""
+"Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
+"рахунка."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6286,7 +6485,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6294,105 +6493,147 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Новы рахунак паспяхова створаны"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Актыўны"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Падзея"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Атрыманае першае паведамленне"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Атрыманае наступнае паведамленне"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Атрыманае наступнае паведамленне"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Чалавек далучыўся"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Чалавек адлучыўся"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Паведамленне адпраўленае"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Фарбаванае паведамленне ў групавой размове"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Новае паведамленне ў групавой размове"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Новы ліст GMail"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Выйсці"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адрасе слоўніка не хапае \"%s\", і гэта не Вікі-слоўнік"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Учора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i дзён таму"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-праграма"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6407,149 +6648,149 @@ msgstr "Імя чалавека: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "У групе"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Імя чалавека"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Вызначыць MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Паведамленне аб змене стану %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Паведамленне аб змене стану"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Захаваць гэтае паведамленне аб змене стану"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Вызначце назву гэтага паведамлення аб змене стану"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Адрас AIM:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Нумар GG:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Нумар ICQ:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Адрас MSN:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Адрас Yahoo!:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
 "%s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Таксама хочам выказаць падзяку ўсім людзям, што збіраюць пакункі з праграмай "
 "для розных сістэмаў."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6560,95 +6801,95 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
@@ -6657,276 +6898,302 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Новае паведамленне"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Новае асобнае паведамленне"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Новае прыватнае паведамленне"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Памылка перадачы файла"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Перадача файла скончаная"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Кансоль XML"
 
-#: ../src/dialogs.py:2568
+#. 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 "Я хачу дадаць Вас у свой кантактны ліст."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Адрас"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Змяніць"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Група"
+
+#. 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 "Я хачу дадаць Вас у мой кантактны ліст."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "калі я "
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6934,38 +7201,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6975,59 +7242,59 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Іншыя"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Канферэнцыі"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7035,317 +7302,342 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Праглядзець"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Выканаць загад..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук у %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Карыстальнікі"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Апісанне"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "Закладка ўжо ўсталяваная"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Закладка паспяхова дададзеная"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
+"вакна."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Загады: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Шыфраванне OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "_Уваходнае паведамленне:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Паролі розняцца"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Змяненне рахунка"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "_Адпаведна стану"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Шыфраванне OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "_Уваходнае паведамленне:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Агульная"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Здольнасці сервера"
@@ -7375,7 +7667,7 @@ msgstr "Памер: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Вы"
 
@@ -7385,7 +7677,7 @@ msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
@@ -7417,27 +7709,28 @@ msgid "Error message: %s"
 msgstr "Памылка: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Перадача файла спыненая чалавекам"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Перадача файла спыненая"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Выберыце файл..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Апісанне: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim не можа даступіцца да гэтага файла"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Гэтым файлам карыстаецца іншы працэс."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
@@ -7457,33 +7750,33 @@ msgstr "Апісанне: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr "Файл з такой назвай ужо існуе, а Вы не маеце правоў на яго перазапіс."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Што Вы хочаце зрабіць?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
@@ -7519,72 +7812,72 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Назва:"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim патрабуе запуску сервера X. Выхад..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ не падтрымлівае libglade"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "Выдаліце бібліятэку GTK+ і ўсталюйце найноўшую стабільную версію з %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Праверце, ці падтрымліваюць бібліятэкі GTK+ і PyGTK сродкі libglade."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim патрабуе PySQLite2 для запуску"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim патрабуе pywin32 для запуску"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7592,11 +7885,11 @@ msgid ""
 msgstr "Праверце, ці ўсталяваны Pywin32. Вы можаце сцягнуць яго з %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim ужо працуе"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7604,25 +7897,34 @@ msgstr ""
 "Gajim ужо працуе\n"
 "Усё роўна запусціць наноў?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7632,140 +7934,179 @@ msgstr ""
 "Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: ../src/gajim.py:571
+#: ../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 "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Запыт падпіскі"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Адпісацца"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s змяніў мянушку на %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 цяпер %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "_Больш не пытацца"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
+"(магчыма, зменная асяроддзя выстаўленая няправільна)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7773,7 +8114,7 @@ msgstr[0] "%d новы ліст"
 msgstr[1] "%d новыя лісты"
 msgstr[2] "%d новых лістоў"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7783,82 +8124,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Выдаліць чалавека з спіса"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Памылка чытання файла:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Для кожнага _паведамлення"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7866,131 +8217,107 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Злучэнне"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "_Больш не пытацца"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можаце ўдзельнічаць у групавой размове нябачным"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Закладка ўжо ўсталяваная"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Закладка паспяхова дададзеная"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
-"вакна."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Паказвае даведку па вызначаным загадзе"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "загад"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "паказаць даведку па загадзе"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Паказаць выплыўнае вакно з наступнай нягледжанай падзеяй"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7998,47 +8325,48 @@ msgstr ""
 "Паказаць спіс усіх людзей у кантактным лісце. Звесткі пра кожнага чалавека "
 "друкуюцца на асобным радку"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "рахунак"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "паказаць людзей з пэўнага рахунка"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Паказаць спіс зарэгістраваных рахункаў"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Змяніць стан рахунка(ў)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "стан"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "паведамленне"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "паведамленне стану"
 
-#: ../src/gajim-remote.py:113
+#: ../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,20 +8374,24 @@ msgstr ""
 "змяніць стан рахунка \"account\". Калі не вызначана, змяняецца стан усіх "
 "рахункаў, якія \"сінхранізуюцца з глабальным станам\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Паказвае вакно, з якога Вы можаце адправіць паведамленне пэўнаму чалавеку"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Калі вызначана, то імя чалавека выбіраецца з спіса гэтага рахунка"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8069,29 +8401,29 @@ msgstr ""
 "рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', без "
 "'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Калі вызначана, паведамленне будзе зашыфраванае адкрытым ключом"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Калі вызначана, паведамленне будзе адпраўленае праз гэты рахунак"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8101,135 +8433,135 @@ msgstr ""
 "OpenPGP і рахунка не абавязковае. Калі Вы хочаце вызначыць толькі 'account', "
 "без 'ключа OpenPGP', проста выставіце 'ключ OpenPGP' у ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "тэма"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "тэма паведамлення"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID чалавека, які атрымае паведамленне"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Атрымаць падрабязныя звесткі пра чалавека"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID чалавека"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Атрымаць падрабязныя звесткі аб рахунку"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Назва рахунка"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Адправіць файл чалавеку"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Месца файла"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Калі вызначана, файл будзе адпраўлены праз гэты рахунак"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Паказаць спіс усіх настаўленняў і іх значэнні"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Выстаўляе значэнне 'ключа' ў 'значэнне'"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ключ=значэнне"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'ключ' ёсць назваю настаўлення, 'значэнне' ёсць выстаўляемым значэннем"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Выдаляе ўласцівасць"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "назва выдаляемай уласцівасці"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запісвае бягучыя настаўленні Gajim у файл .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Дадаць чалавека ў спіс"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Дадаць новага чалавека для гэтага рахунка"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Вяртае бягучы стан (глабальны, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Вяртае бягучае паведамленне аб стане (глабальнае, калі не вызначаны рахунак)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Вяртае колькасць нечытаных паведамленняў"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Адкрыць вакно 'Пачаць размову'"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Пачаць размову для рахунка"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Адправіць асаблівы XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "Адправіць XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8237,72 +8569,77 @@ msgstr ""
 "Рахунак, на які будзе адпраўлены xml; калі не вызначаны, xml будзе "
 "адпраўлены на ўсе рахункі"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Апрацоўваць спасылкі xmpp:/"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "спасылка"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "змест паведамлення"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Увайсці ў размоўны пакой"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "пакой"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Пакой:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "мянушка"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Паролі розняцца"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8311,31 +8648,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8344,7 +8681,7 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8353,7 +8690,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8362,7 +8699,7 @@ msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Няправільная спасылка"
 
@@ -8380,177 +8717,180 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "назва тэмы"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Вы не можаце выдаліць актыўную тэму"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы выйшлі з пакоя \"%s\", альбо \"%s\" сышоў."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s пакараў %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Няправільнае імя карыстальніка"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Для гэтай групавой размовы не вызначаная тэма размовы"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s запрошаныя ў %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Мянушка не знойдзеная: %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 ""
 "Карыстанне: /%s <мянушка|JID> [прычына], забараняе JID-у казанне для гэтай "
 "групавой размовы. Мянушку парушальніка можна змясціць тут, калі яна не "
 "ўтрымлівае знака \"@\". Калі JID яшчэ ўдзельнічае ў групавой размове, ён "
 "таксама будзе выкінуты адтуль. Прагалы ў мянушках не падтрымліваюцца."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8558,7 +8898,7 @@ msgid ""
 msgstr ""
 "Карыстанне: /%s <мянушка>, адкрывае вакно прыватнай размовы з чалавекам."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8567,7 +8907,7 @@ msgstr ""
 "Карыстанне: /%s [прычына], закрывае вакно / картку, паказаўшы вызначаную "
 "прычыну."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8576,7 +8916,7 @@ msgstr ""
 "Карыстанне: /%s <JID> [прычына], запрашае JID паўдзельнічаць у гэтай "
 "групавой размове, з пазначанай прычынай запрашэння."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8585,18 +8925,17 @@ msgstr ""
 "Карыстанне: /%s <пакой>@<сервер>[/мянушка], увайсці ў пакой room@server з "
 "вызначанай мянушкай."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Карыстанне: /%s <мянушка> [прычына], выкідае парушальніка з вызначанай "
 "мянушкай з групавой размовы з паказанай прычынай. Прагалы ў мянушках не "
 "падтрымліваюцца."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8605,23 +8944,23 @@ msgstr ""
 "Карыстанне: /%s <мянушка> [паведамленне], адкрывае вакно прыватнай размовы і "
 "адпраўляе паведамленне чалавеку."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Карыстанне: /%s, хавае кнопкі групавой размовы."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Карыстанне: /%s [тэма], паказвае ці змяняе тэму групавой размовы."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8629,60 +8968,75 @@ msgstr ""
 "Карыстанне: /%s <паведамленне>, адпраўляе паведамленне, не шукаючы іншых "
 "загадаў."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 ""
+"Карыстанне: /%s <мянушка>, змяняе Вашую мянушку ў гэтай групавой размове."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -8713,77 +9067,77 @@ msgstr "Падрабязнасці"
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
 #. 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 "Немагчыма запісаць у %s. Сеансы не працуюць"
 
 #. 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 не з'яўляецца прадвызначанай Jabber-праграмай"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ці Вы хочаце зрабіць Gajim прадвызначанай 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 ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-"
 "праграмай"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../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 ""
 "Немагчыма захаваць малюнак у фармаце %(type)s. Захаваць як %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Людзі"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Мянушка"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8791,7 +9145,7 @@ msgstr ""
 "Вы сапраўды хочаце ачысціць базу дадзеных? (Увага: закрыйце Gajim перад "
 "працягам)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8805,178 +9159,188 @@ msgstr ""
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Экспартаванне журналаў..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Вы сапраўды хочаце выдаліць журнал размоў з выбранай асобай?"
 msgstr[1] "Вы сапраўды хочаце выдаліць журналы размоў з выбранымі асобамі?"
 msgstr[2] "Вы сапраўды хочаце выдаліць журналы размоў з выбранымі асобамі?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
-#: ../src/history_manager.py:585
+#: ../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] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 msgstr[1] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 msgstr[2] "Вы сапраўды хочаце выдаліць выбраныя паведамленні?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Журнал размоў %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s цяпер %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Вы не злучаны з серверам"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Размовы"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Паведамленні"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новае асобнае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Новае прыватнае паведамленне ў групавой размове %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Агульная"
+msgid "Ignore"
+msgstr "дзевяць"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Атрыманыя звесткі"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Вы не можаце абнавіць Вашыя асабістыя звесткі, не злучыўшыся з серверам."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Адпраўленне профіля..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Звесткі НЕ абноўленыя"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Памылка абнаўлення vCard"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -8984,55 +9348,46 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1920
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
-"(магчыма, зменная асяроддзя выстаўленая няправільна)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9040,15 +9395,28 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Вы сапраўды хочаце сысці з групавой размовы \"%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 "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9057,26 +9425,26 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9084,52 +9452,57 @@ msgid ""
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэтыя транспарты: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9138,12 +9511,12 @@ msgstr ""
 "прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9152,16 +9525,16 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9171,19 +9544,19 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9192,12 +9565,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3786
+#: ../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 "
@@ -9207,12 +9580,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9220,137 +9593,138 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Адправіць %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Зрабіць %s і %s мета-кантактамі"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "выкарыстоўвае рахунак %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "рахунку %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Кіраванне закладкамі..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "рахунка %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Актыўны"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Праглядзець сервісы..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Новая групавая размова"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Змяніць паведамленне стану..."
 
@@ -9367,20 +9741,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Тэма: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9390,7 +9764,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9400,129 +9774,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Змяніць паведамленне стану..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
-#: ../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 "Рэсурс: "
 
-#: ../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 гэтай групавой размовы"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Апошняе паведамленне: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " ад %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Чалавек адлучыўся"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Падпіска: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Пакой:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Актывізаваны"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Тып:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Сцягнуць"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Загрузіць"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Тып: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Не пачатая"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Спыненая"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Скончаная"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Прыпыненая"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Марнаванне часу"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Перадача"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: ../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"
@@ -9538,53 +9902,117 @@ msgstr "?Праграма:Невядомая"
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Праграма:Невядомая"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, і ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Шыфраванне OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Пстрыкніце, каб праглядзець спіс здольнасцяў jabber-сервераў (напр., "
+#~ "транспарты MSN, ICQ)"
+
+#~ msgid "Servers Features"
+#~ msgstr "Здольнасці сервера"
+
+#~ msgid "Your JID:"
+#~ msgstr "Ваш JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Імя:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Вузел:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Паказаць _галоўнае вакно"
+
+#~ msgid "Modify Account"
+#~ msgstr "Змяніць рахунак"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" выконвае %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Рахунак Gajim %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Адмысловы</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Паўторны Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Гэты рахунак ужо выкарыстоўваецца ў Gajim."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Перадача файла спыненая чалавекам"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Агульная"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Актыўны"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s не распаўсюджвае ключ OpenPGP і не мае прызначанага ключа"
@@ -9610,9 +10038,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "_Retype Password:"
 #~ msgstr "Паўта_рыце пароль:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "С_карыстаць проксі"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9794,9 +10219,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Адмысловыя настаўленні нагадванняў..."
 
-#~ msgid "_Font:"
-#~ msgstr "_Шрыфт:"
-
 #~ msgid "_Never"
 #~ msgstr "_Ніколі"
 
@@ -9809,12 +10231,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "_Pop it up"
 #~ msgstr "_Вынырваць"
 
-#~ msgid "_URL:"
-#~ msgstr "_Спасылка:"
-
-#~ msgid "Address"
-#~ msgstr "Адрас"
-
 #~ msgid "City:"
 #~ msgstr "Горад:"
 
@@ -9943,9 +10359,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Перанесці %s у групу %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Зрабіць %s і %s мета-кантактамі"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Схаваць кнопкі прыватнай размовы."
 
@@ -9976,9 +10389,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgstr[1] "%d нечытаныя прыватныя паведамленні"
 #~ msgstr[2] "%d нечытаных прыватных паведамленняў"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Немагчыма злучыцца з вузлом: некарэктны адказ сервера."
diff --git a/po/be@latin.po b/po/be@latin.po
index de0ff36ca..b3ea59342 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -1,15 +1,15 @@
 # Biełarusji pierakład Gajim
 # Copyright (C) 2006-2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as Gajim.
-# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006-2007.
 # Based on cyrillic version.
 #
+# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2006-2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-03-10 02:03+0300\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:41+0200\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian Latin <i18n@mova.org>\n"
 "MIME-Version: 1.0\n"
@@ -41,7 +41,7 @@ msgid "_Add Contact..."
 msgstr "_Dadaj kantakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Šukaj servisy"
 
@@ -64,7 +64,7 @@ msgid "_Personal Events"
 msgstr "Asabistyja źviestki"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Pačni razmovu"
@@ -99,67 +99,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Pstykni, kab pahladzieć zdolnaści serveraŭ Jabber (naprykład, šluzy MSN, ICQ)"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Dałučysia pa nacisku knopki \"Skonč\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Stvareńnie kontu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ja ŭžo maju patrebny kont"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Ja chaču za_rehistravać novy kont"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Kiruj..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Zachavaj _parol"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Zdolnaści serveraŭ"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Nastaŭ profil paśla złučeńnia"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Skarystaj admysłovy host/port"
 
@@ -172,31 +170,32 @@ msgstr ""
 "Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Vaš JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Dadatkovyja"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Skonč"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nazva hosta: "
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Parol:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -204,11 +203,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Imia karystalnika:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -217,18 +211,16 @@ msgstr "<b>Roznaje</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Asabistyja źviestki</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Kont"
 
@@ -237,24 +229,23 @@ msgid "Account Modification"
 msgstr "Madyfikacyja kontu"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Śpis administrataraŭ"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Aŭtamatyčna pieradałučajsia pry abryvie złučeńnia"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Zlučajsia pry starcie Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Ź_miani parol"
 
@@ -271,37 +262,35 @@ msgstr ""
 "a hetaja opcyja adklučaje vykarystańnie TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Abiary _kluč..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klikni, kab źmianić parol dla kontu"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Złučeńnie"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Źmiani asabistyja źviestki..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -309,17 +298,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Ahulnaja"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nazva hosta: "
 
@@ -342,7 +328,6 @@ msgstr ""
 "dziela zapeŭnivańnia servera ŭ tym, što złučeńnie vykarystoŭvajecca"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -352,7 +337,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -362,7 +346,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -377,43 +360,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Kluč nie abrany"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Nijaki"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Asabistyja źviestki"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Pryjary_tet:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -424,7 +409,7 @@ msgstr ""
 "pryjarytetam budzie atrymvać paviedamleńni"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Źmianiaj pryjarytet aŭtamatyčna zhodna z statusam."
 
@@ -433,12 +418,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "_Krynica:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -452,30 +437,25 @@ msgstr ""
 "najvyšejšym pryjarytetam. (hladzi nižej)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Zachavaj _parol (niebiaśpiečna)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "_Synchranizuj status kontu z glabalnym statusam"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -486,21 +466,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Skarystaj _SSL (zastarełaja opcyja)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Dastasuj da statusu"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Imia:"
 
@@ -509,31 +484,38 @@ msgstr "_Imia:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Ułaścivaści</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Dastasuj da statusu"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Konty"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Zlučajsia pry starcie Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ukluč"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Imia:"
 
@@ -543,7 +525,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -554,56 +535,96 @@ msgstr ""
 "Taksama moža spatrebicca źmianić nałady firewalla."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "JID:"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Proźvišča:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Źlej konty ŭ adno"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Źmiani nazvu"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "_Synchranizuj status kontu z glabalnym statusam"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Skarystaj admysłovy host/port"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Užyvaj admysłovy port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Źmiani asabistyja źviestki..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Ukluč"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nazva hosta: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Kiruj..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Kont:"
@@ -791,7 +812,7 @@ msgid "All statuses"
 msgstr "Usie statusy"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Adyjšoŭ"
 
@@ -808,7 +829,7 @@ msgid "Have "
 msgstr "Nie razmaŭlaju "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Niabačny"
 
@@ -817,7 +838,7 @@ msgid "Launch a command"
 msgstr "Vykanaj zahad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Niedastupny"
 
@@ -936,7 +957,7 @@ msgstr "Apošniaja źmiena:"
 msgid "New entry received"
 msgstr "Atrymaŭ novy zapis"
 
-#: ../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 "Atrymaŭ novy zapis:"
 
@@ -984,11 +1005,21 @@ msgstr "Uviadzi novy parol:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Uviadzi novaje paviedamleńnie statusu</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Dziejny"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Pakoj:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Šablony paviedamleńniaŭ statusu:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Zachavaj jak šablon..."
 
@@ -1051,11 +1082,11 @@ msgstr "_Dadaj u śpis kantaktaŭ"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
@@ -1163,7 +1194,7 @@ msgstr "Hetaje dziejańnie anuluje pieradaču fajła i vydalić jaje ź śpisu."
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Pakažy nahadvańnie ŭ vypłyŭnym aknie pa zakančeńni pieradačy fajła"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Praciahni"
 
@@ -1199,7 +1230,7 @@ msgstr ""
 "Kantakt\n"
 "Baner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Tłusty"
 
@@ -1219,11 +1250,11 @@ msgstr "Kanfihuracyja temy Gajim"
 msgid "Gone"
 msgstr "Vyjšaŭ"
 
-#: ../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 "Pasiŭny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Nachileny"
 
@@ -1274,7 +1305,7 @@ msgstr "Źmiani _temu"
 msgid "Configure _Room..."
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Stvary zakładku dla hetaja pakoju"
@@ -1310,23 +1341,37 @@ msgstr "_Administratar"
 msgid "_Ban"
 msgstr "Za_blakuj"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Vypchni"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Udzielnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Uładalnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Dasłać pryvatnaje paviedamleńnie"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Daj hołas"
 
@@ -1334,13 +1379,13 @@ msgstr "_Daj hołas"
 msgid "Create new post"
 msgstr "Stvary novy zapis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Ad"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tema"
 
@@ -1365,7 +1410,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
-#: ../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 "Vydal"
 
@@ -1390,7 +1436,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Šukaj u bazie žurnałaŭ"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Žurnał razmoŭ"
 
@@ -1411,7 +1457,7 @@ msgstr "Šukaj"
 msgid "_Log conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
@@ -1438,8 +1484,8 @@ msgstr "Niadaŭna:"
 msgid "Room:"
 msgstr "Pakoj:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Dałučysia"
 
@@ -1469,7 +1515,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Pakazvaj 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:"
 
@@ -1504,32 +1550,51 @@ msgstr "<b>Nałady</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "Złučeńnie HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Kiruj profilami proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Nazva:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Parol:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Typ:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Užyvaj aŭtaryzacyju"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "S_karystaj proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Imia karystalnika:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1569,17 +1634,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Klikni, kab ustavić smajlik (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Vyšli"
 
@@ -1686,10 +1756,14 @@ msgstr ""
 "Niedastupny/Zaniaty/Niabačny"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Spytaj paviedamleńnia statusu, kali ja:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1703,23 +1777,23 @@ msgstr ""
 "Zaŭsiody karystacca prahramami, pryznačanymi dla KDE\n"
 "Inšyja"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "Zaŭsiody pry starcie praviaraj, ci pryznačany Gajim _zmoŭčanym klijentam "
 "Jabber"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Kanfihuruj koler i šryft interfejsu"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1728,34 +1802,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1765,7 +1839,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
 "pakazvać u voknach razmoŭ."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1775,7 +1849,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
 "surazmoŭcam."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1783,12 +1857,12 @@ msgstr ""
 "Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
 "kucie ekranu"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1797,7 +1871,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1805,18 +1879,18 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1824,7 +1898,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1832,7 +1906,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
 "kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1840,7 +1914,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1848,7 +1922,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1856,14 +1930,14 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1875,14 +1949,14 @@ msgstr ""
 "što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
 "tabie paviedamleńnie"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1891,7 +1965,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1901,13 +1975,13 @@ msgstr ""
 "kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
 "MSN)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1915,67 +1989,79 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
 "(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Hrupuj vokny:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "_Kiruj..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Madyfikacyja kontu"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "_Ahučvaj"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Nałady"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Dałučajusia"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Adłučajusia"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1984,148 +2070,152 @@ msgstr ""
 "kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
 "biez afarmleńnia."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Paradkuj kantakty pa statusie"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standartny zbor _ikon statusu:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Zatrymana"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Užyvaj _ikony transpartaŭ"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Užyvaj _zmoŭčany dla systemy"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kali ŭčyniajecca novaja padzieja"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Hartač:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Smajliki:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Kiraŭnik fajłaŭ:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Padśviatlaj słovy z pamyłkami"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Paštovaja prahrama:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Adčyni..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Zychodnaje paviedamleńnie:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Viarni zvyčajnyja kolery"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Dałučysia da _pakoju"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "chvilinaŭ"
 
@@ -2173,7 +2263,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Paradak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
@@ -2243,127 +2333,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Asablivy</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Huki</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Addzieł:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Dadatkovy adras:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Proźvišča:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Asablivy</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Chatniaja staronka:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Dadaj praviła</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Asablivy</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Mianuška:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefon:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Umovy</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Paštovy indeks:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Ułaścivaści</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Huki</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Nałady</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Nałady</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Huki</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Pra siabie"
 
@@ -2373,17 +2463,17 @@ msgstr "Klikni, kab vystavić svoj avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Farmat: HHHH-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Asabistyja źviestki"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Praca"
 
@@ -2401,8 +2491,8 @@ msgstr "Vydal kont i dla Gajim, i na _servery"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Vydal"
 
@@ -2427,14 +2517,14 @@ msgstr "Źmiani _hrupy"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Vykanaj zahad..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
@@ -2445,7 +2535,7 @@ msgstr "_Vydal"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Dasyłaje svoj XML"
@@ -2472,12 +2562,6 @@ msgstr "Pačni _razmovu"
 msgid "_Allow him/her to see my status"
 msgstr "Dazvol jamu/joj _bačyć moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Za_barani jamu/joj bačyć moj status"
@@ -2501,17 +2585,35 @@ msgstr "Źmiani _nazvu"
 msgid "_Subscription"
 msgstr "_Aŭtaryzacyja"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "dziaviataja"
 
+#: ../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 "Vydal"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2539,59 +2641,64 @@ msgid "Profile, A_vatar"
 msgstr "Profil, a_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Pakažy _adłučanyja kantakty"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Pakažy _transparty"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Konty"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Dziejańni"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Źmiest"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Źmianić"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_Častyja pytańni"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Dapamoha"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Nałady"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Skonč pracu"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Dašli _asobnaje aviedamleńnie..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Vyhlad"
 
@@ -2610,12 +2717,12 @@ msgid "_Add contact"
 msgstr "_Dadaj kantakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "Š_ukaj"
 
@@ -2704,10 +2811,6 @@ msgstr "Zapyt aŭtaryzacyi"
 msgid "_Deny"
 msgstr "_Admoŭ"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2733,10 +2836,6 @@ msgstr "Vyšli _asobnaje paviedamleńnie"
 msgid "Show All Pending _Events"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Pakažy _śpis kantaktaŭ"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2756,55 +2855,60 @@ msgstr "<b>Dziejańni</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Nałady</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "JID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Krynica:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Nałady</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Apisańnie</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Kamentary"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kantakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Bolš"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Avatar:"
@@ -2817,6 +2921,11 @@ msgstr "<b>Trafik Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Uvod XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Ukluč"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2845,13 +2954,13 @@ msgstr "Pryznač kluč Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Źmiani _hrupy"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "Źmiani _nazvu"
 
@@ -2875,30 +2984,26 @@ msgstr "Krynica:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Madyfikuj kont"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Źviestki ab kantakcie"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2923,7 +3028,7 @@ msgstr "Cely lik"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Koler"
 
@@ -2948,224 +3053,261 @@ msgstr "(Niama)"
 msgid "Hidden"
 msgstr "Schavany"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Atrymaŭ novy zapis:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Anhielskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Biełaruskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Baŭharskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Breton"
 msgstr "Brytonskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Českaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Niamieckaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Hreckaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Brytanskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Hišpanskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francuzkaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Charvackaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italijskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Narveskaja (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Halandzkaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Narveskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Partuhalskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazilskaja partuhalskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Rasiejskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbskaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Słavackaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Švedzkaja"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Kitajskaja (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Mova spraŭdžvańnia pravapisu"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Ty nia možaš dasłać paviedamleńnie, pakul nia złučyśsia z serveram."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "dziaviataja"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Mianuška"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Šryft:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Źviestki ab kantakcie"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Šyfravańnie ŭklučanaje"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Niama ŭ śpisie"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" ŭ vykanańni %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pakoju %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
@@ -3173,33 +3315,33 @@ msgstr "Užyvaj aŭtaryzacyju"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Zahady: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Užyvańnie: /%s, ačyščaje akno ad tekstu."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3208,66 +3350,66 @@ msgstr ""
 "Užyvańnie: /%s <dziejańnie>, dasyłaje dziejańnie ŭ dziejny pakoj (ad treciaj "
 "asoby). (naprykład, /%s rahoča, jak koń.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Užyvańnie: /%s, chavaje knopki razmovy."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Niama daviedki pa /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3275,183 +3417,195 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 jość fajłam, ale musiŭ być kataloh"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 zaviaršaje vykanańnie"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jość kataloham, ale musiŭ być fajł"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "stvarajecca kataloh %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Źmiani infarmacyju statusu"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Źmiani status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Akreśli typ bačnaści i apisańnie"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Dałučany"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Adyjšoŭ"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Nie turbavać"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Niabačny - adłučany"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Apisańnie statusu:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Status źmianiŭsia."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Pakiń pakoji"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pakoju %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Zaznač pakoji, jakija chočaš pakinuć"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Pakoji"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Ty pakinuŭ nastupnyja pakoji:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d niečytanaje paviedamleńnie"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Pakazvaj nahadvańni z dapamohaj DBus i Notification-Daemon"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Adyjšoŭ\"."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Status \"Adyjšoŭ\" jak vynik biaździejnaści prahramy"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Čas u chvilinach, paśla katoraha tvoj status źmienicca na \"Niedastupny\"."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Status \"Niedastupny\" jak vynik biaździejnaści prahramy"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Uklučy lakalnyja paviedamleńni praz Zeroconf"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Mova pravierki pravapisu"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3462,7 +3616,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nie pakazvaj času."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3472,18 +3626,18 @@ msgstr ""
 "adklučyć niedakładnaść. 1 akreślivaje samy dakładny čas, 4 akreślivaje samy "
 "niedakładny. Zadziejničana, kali opcyja print_time maje vartaść 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znakaŭ * / _  jak znaki farmatavańnia."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Kali maje vartaść True, nie vydalaj */_ . Takim čynam *abc* budzie tłustym, "
 "ale i znaki * * nia vydalacca."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3495,14 +3649,14 @@ msgstr ""
 "rst/restructuredtext.html (Kali chočaš karystacca hetaj mahčymaściu, "
 "zainstaluj docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 "Znak, jaki dadajecca paśla mianuški pry dapaŭnieńni (klavišaj TAB) u pakoji."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3510,7 +3664,7 @@ msgstr ""
 "Znak, jaki dadajecca paśla mianuški, kali akreślenaja mianuška ŭžyvajecca ŭ "
 "movie inšaha ŭdzielnika pakoju."
 
-#: ../src/common/config.py:161
+#: ../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 "
@@ -3521,32 +3675,32 @@ msgstr ""
 "\". Hladzi padrabiaznyja źviestki ŭ dakumentacyi dla Pythonu pa funkcyi "
 "strftime: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, što pakazvajucca ŭ razmovie pierad mianuškaj"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, što pakazvajucca ŭ razmovie paśla mianuški"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Dadać * i [n] u zahałovak śpisu kantaktaŭ?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 "Kolki radkoŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym aknie."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Kolki chvilinaŭ z apošniaj razmovy zapaminać i pakazvać u znoŭ adčynienym "
 "aknie."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3554,11 +3708,11 @@ msgstr ""
 "Dasyłaj paviedamleńnie praz Ctrl+Enter, a Enteram stvaraj novy radok "
 "(zmoŭčanyja pavodziny Mirabilis ICQ)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolki radkoŭ zachoŭvać dla Ctrl+KeyUP."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3567,12 +3721,12 @@ msgstr ""
 "Albo specyjalny adrasm jaki ŭtrymlivaje %s, dzie %s jość słovam/vyrazam, "
 "albo radok 'WIKTIONARY', što aznačaje vykarystańnie Wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajimam možna kiravać praz gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3584,14 +3738,14 @@ msgstr ""
 "maje vartaści False i jakija synchranizujucca z hlabalnym stanam) zhodna "
 "statusu sietkavaha złučeńnia."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Dasyłaj nahadvańni ab stanie razmovy. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3599,7 +3753,7 @@ msgstr ""
 "Pakazanyja nahadvańni stanu razmovy ŭ voknach. Musić być adnoj z nastupnych "
 "vartaściaŭ: all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3607,11 +3761,11 @@ msgstr ""
 "Kali čas pakazvajecca nie dla kožnaha paviedamleńnia "
 "(print_time==sometimes), pakazvaj jaho kožnyja x chvilinaŭ."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3619,7 +3773,7 @@ msgstr ""
 "Zaŭsiody pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3627,7 +3781,13 @@ msgstr ""
 "Nikoli nie pytajsia paćvierdžańnia pierad začynieńniem kartki/akna razmovy z "
 "hetaha śpisu padzielenych prabiełami nazvaŭ pakojaŭ."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3636,33 +3796,27 @@ msgstr ""
 "Nadpisvaje host, jaki vysyłajecca dla Pieradačy fajłaŭ, u vypadku tranślacyi "
 "adrasoŭ/pieranakiravańnia partoŭ."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standart IEC vyznačaje, što KiB = 1024 bajtaŭ, KB = 1000 bajtaŭ."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Nahadvaj ab padziejach ikonaj pola nahadvańnia."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Pakazvać kartku, kali dziejnaja tolki adna razmova?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Pakazvać padzieł kartak u voknach razmovy?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Pakazvać knopki začynieńnia na kartkach?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3670,18 +3824,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Śpis padzielenych kropkaj z koskaj słovaŭ, jakija treba padśviatlać u "
 "pakojach."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3690,14 +3844,14 @@ msgstr ""
 "X Kiraŭnika voknaŭ. Hetaja nałada dziejničaje tolki ź dziejnaj ikonaj pola "
 "nahadvańnia."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie praviarać, ci akreśleny jon jak "
 "zmoŭčany klijent Jabber."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3706,7 +3860,7 @@ msgstr ""
 "niečytanymi paviedamleńniami. U zaležnaści ad matyvu, hetaja ikona moža być "
 "animavanaj."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3714,11 +3868,11 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim pakazvaje status kožnaha kantaktu, kali "
 "jon nie pusty, dla kožnaha elementu śpisu kantaktaŭ."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3727,7 +3881,7 @@ msgstr ""
 "kantaktu, jaki nia mieŭ avatara byłym razam, albo kali buferavany avatar "
 "sastareje."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3735,7 +3889,7 @@ msgstr ""
 "Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
 "surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3750,30 +3904,30 @@ msgstr ""
 "vartaść \"in_and_out\", Gajim budzie pakazvać tolki paviedamleńni ab "
 "dałučeńni/adłučeńni surazmoŭcaŭ."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki adłučylisia."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Kali opcyja maje vartaść True, adnoŭlenyja paviedamleńni buduć pakazvacca "
 "mienšym za zmoŭčany šryftam."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pakazvaj avatara dla transpartu."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3783,7 +3937,7 @@ msgstr ""
 "albo paźniejšaj, mirhaj aknom (zmoŭčanyja pavodziny akna ŭ bolšaści "
 "Kiraŭnikoŭ voknaŭ) pry najaŭnaści niečytanych paviedamleńniaŭ."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3794,7 +3948,7 @@ msgstr ""
 "słać takija danyja SHA."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3814,34 +3968,34 @@ msgstr ""
 "pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
 "ŭruchomić Gajima nanoŭ."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Kali opcyja maje vartaść False, ty bolš nia ŭbačyš avatara ŭ aknie razmovy."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Kali opcyja maje vartaść True, nacisk klavišy Escape začyniaje kartku/akno."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Chavaje baner u aknie pakoju"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Chavaje baner u aknie pryvatnaj razmovy"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Chavaje śpis naviednikaŭ pakoju."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3849,29 +4003,29 @@ msgstr ""
 "U pakoji pakazvaj mianušku pierad paviedamleńniem, tolki kali jaho napisała "
 "nia taja asoba, što napisała papiaredniaje paviedamleńnie."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Dašli paviedamleńnie i začyni akno"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Śpis koleraŭ dla farbavańnia mianušak u pakojach."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab pierachodzić na nastupnuju kartku, kali na dziejnaj niama "
 "niečytanych paviedamleńniaŭ."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3879,7 +4033,7 @@ msgstr ""
 "Ci treba pakazvać akno paćvierdžańnia pry stvareńni metakantaktu? Pusty "
 "radok aznačaje, što hetaje akno nikoli nia budzie pakazvacca."
 
-#: ../src/common/config.py:256
+#: ../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 "
@@ -3889,7 +4043,7 @@ msgstr ""
 "madyfikacyi kontu. UHAVA: kali ty dałučajeśsia z admoŭnym pryjarytetam, to "
 "nia budzieš atrymvać paviedamleńniaŭ z servera."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3897,7 +4051,16 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
 "Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Kali opcyja maje vartaść True, Gajim budzie zachoŭvać paroli z dapamohaj "
+"Kiraŭnika parolaŭ GNOME (kali jość mahčymaść)."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3905,7 +4068,7 @@ msgstr ""
 "Kali opcyja maje vartaść True, Gajim budzie pakazvać kolkaść dałučanych "
 "kantaktaŭ i ahulnuju kolkaść kantaktaŭ u radkach kontaŭ i hrupaŭ."
 
-#: ../src/common/config.py:259
+#: ../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"
@@ -3913,51 +4076,57 @@ msgstr ""
 "Moža być pustym albo mieć vartaść 'chat' ci 'normal'. Kali vartaść nie "
 "pustaja, traktuj usie ŭvachodnyja paviedamleńni jak paviedamleńni hetaha typu"
 
-#: ../src/common/config.py:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../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 separately)"
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"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:278
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3965,60 +4134,68 @@ msgstr ""
 "Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
 "akreślivajucca ŭ opcyjach autopriority_*."
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Abychod dla Jabberd2"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4026,119 +4203,125 @@ msgstr ""
 "Kali hetaja opcyja ŭklučanaja, Gajim budzie pieradavać fajły z akreślenym "
 "adrasam IP i proxy-serveram z opcyi file_transfer_proxies."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "\"all\" albo statusy, padzielenyja prabiełami"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' albo 'both'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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' albo ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Splu"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Pracuju"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4146,148 +4329,178 @@ msgstr ""
 "Hukm jaki treba hrać, kali paviedamleńnie ŭ pakoji ŭtrymlivaje adno sa "
 "słovaŭ, akreślenych u opcyi muc_highlight_words, albo tvaju mianušku."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Huk, jaki treba hrać pry atrymańni novaha hrupavoha paviedamleńnia."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "zialony"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "bakaleja"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "čałaviek"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marski"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Niapravilny host"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Źviestki rehistracyi dla transpartu %s nie pryjšli ŭ čas"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Zarehistrujsia na %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Niemahvyma dałučycca"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Niapravilny JID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Mianuška nie dazvolenaja: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Niemahčyma dałučycca da pakoju"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Ty zablakavany ŭ hetym pakoji."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Takoha pakoju niama."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "padpisany na %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zapyt adpiski ad %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ciapier adpisany ad %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4298,247 +4511,252 @@ msgstr ""
 "naprykład, http://jru.jabberstudio.org/"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Parol OpenPGP nia vyznačany"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Ty dałučyśsia da %s biaz OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Niapravilny adkaz"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transpart %s niapravilna adkazaŭ na zapyt rehistracyi: %s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Niemahvyma dałučycca"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Zapisany ŭ: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Niemahvyma dałučycca"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Pravier złučeńnie albo paŭtary paźniej"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4547,26 +4765,31 @@ msgstr ""
 "Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych "
 "krynic. Adklučy jaje i paŭtary znoŭ."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Niemahčyma dasyłać pustyja fajły"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4575,19 +4798,30 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Kantakty"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Naziralniki"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transparty"
 
@@ -4596,11 +4830,11 @@ msgid "Not in roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Nie staje fajłaŭ padtrymki Python dla D-Bus na hetym kamputary"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Niemahčyma vykarystać mahčymaści D-Bus dla Gajima"
 
@@ -4631,356 +4865,356 @@ msgstr ""
 "Interfejs sesijaŭ niedastupny.\n"
 "Pasprabuj pračytać: http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dvanaccataja"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "pieršaja"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "druhaja"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "treciaja"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "čaćviortaja"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "piataja"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "šostaja"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "siomaja"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "vośmaja"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "dziaviataja"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dziasiataja"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "adzinaccataja"
 
+#. 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 "dvanaccataja"
-
-#. 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 hadzinaŭ"
+msgid "%(0)s o'clock"
+msgstr "%(0)s hadzinaŭ"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "piać chvilinaŭ na $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "piać chvilinaŭ na %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "dziesiać chvilinaŭ na $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "dziesiać chvilinaŭ na %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "čverć na $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "čverć na %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dvaccać chvilinaŭ na $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "dvaccać chvilinaŭ na %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dvaccać piać chvilinaŭ na $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "dvaccać piać chvilinaŭ na %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "pałova na $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "pałova na %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "biez dvaccaci piaci chvilinaŭ $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "biez dvaccaci piaci chvilinaŭ %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "biez dvaccaci chvilinaŭ $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "biez dvaccaci chvilinaŭ %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "biaz čverći $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "biaz čverći %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
 msgstr "bieź dziesiaci chvilinaŭ $s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "bieź piaci chvilinaŭ $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "bieź piaci chvilinaŭ %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 hadzinaŭ"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s hadzinaŭ"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noč"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Śvitanak"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Ranica"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Amal poŭdzień"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Poŭdzień"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Papoŭdni"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Viečar"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Poźni viečar"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Pačatak tydnia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Siaredzina tydnia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Kaniec tydnia"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Niapravilny znak u imiani karystalnika."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Patrabujecca adras servera."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Niapravilny znak u naźvie hostu."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Dastupny"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dastupny"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Adłučany"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administratar"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "piša paviedamleńnie..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4988,22 +5222,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5011,736 +5245,746 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "pamyłka: niemahčyma adčynić %s, kab adčytać"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Kont Gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "kontu %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Prypynienaja"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Tłusty"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Nie razmaŭlaju "
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Razmovy"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Tłusty"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Źmiest"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Zavieršana"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Źmiest"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Niadziejny"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Vydal"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Adklučana"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Adklučana"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Adklučana"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Excited"
 msgstr "Dziejny"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Hrupa"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "paviedamleńnie"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Dziejny"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Niabačny"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "pieršaja"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Niamieckaja"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Madyfikuj"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Adłučany"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Hrupa"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "adzinaccataja"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Zatrymana"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Apošniaja źmiena:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Mianuška"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Splu"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Vulica:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Aŭtaryzavany"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Čas"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "dziaviataja"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Niapravilny host"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Viečar"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Uvod paviedamleńnia"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Ranica"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "pavodle hrupy"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Viečar"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Vypichvajecca %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Dałučysia"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "pakoj"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Jem"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Źmianiajecca tema"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Vypichvajecca %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Jem"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Vypichvajecca %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Jem"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Adłučajusia"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Jem"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Pryčyna"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Pryčyna"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Splu"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jem"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Hladžu film."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Jem"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Pieradajecca"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Uvod paviedamleńnia"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "On a Plane"
 msgstr "Dałučany"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Adčyni jak _spasyłku"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Uvod paviedamleńnia"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Pracuju"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Niemahčyma dałučycca da portu %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5748,20 +5992,13 @@ msgstr ""
 "Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Niemahčyma złučycca z hostam: pieravyšany termin čakańnia padčas adsyłańnia "
-"źviestak."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5770,15 +6007,15 @@ msgstr ""
 "Host, akreśleny ŭ opcyi ft_override_host_to_send, niapravilny, tamu "
 "ihnarujecca."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Kab paciahnuć kamunikacyju, treba ŭruchomić Gajim nanoŭ."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Pamyłka Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5787,95 +6024,85 @@ msgstr ""
 "%s\n"
 "Lakalnyja paviedamleńni mohuć pracavać pamyłkova."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kali łaska, pravier instalacyju Avahi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Niemahčyma ŭruchomić lakalny servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niemahčyma dałučycca da portu %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Niemahčyma źmianić status kontu \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr "Ty nie dałučany albo niebačny. Ty nia možaš dasyłać paviedamleńni."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kantakt adłučany. Niemahčyma dasłać paviedamleńnie."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Niemahčyma złučycca z hostam: pieravyšany termin čakańnia padčas adsyłańnia "
+"źviestak."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Pamyłka dadańnia servisu. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Adklučana"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Dziejny"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Padzieja"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Asablivy</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5884,251 +6111,209 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Atrymanaje pieršaje paviedamleńnie"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Atrymanaje novaje paviedamleńnie"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Atrymanaje novaje paviedamleńnie"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kantakt dałučyŭsia"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kantakt adłučyŭsia"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Paviedamleńnie dasłanaje"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Novaje paviedamleńnie ŭ pakoji"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Novy list na skryncy GMail"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Nazva"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Pieradałučycca?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Kali chočaš zadziejničać źmieny, treba pieradałučycca."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Akno razmovy adčynienaje dla kontu %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Usie adčynienyja vokny razmovy buduć začynienyja. Praciahnuć?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "Kab źmianić nazvu kontu, treba pračytać usie novyja paviedamleńni."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Taki kont užo zaniaty"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kiruj kontami"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Niapravilny JID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Niama złučeńnia z serveram"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Nie złučyŭšysia z serveram, niemahčyma źmianiać asabistyja źviestki."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Kali łaska, źmiani nazvu albo vydal jaho pierad uklučeńniem miascovych "
 "paviedamleńniaŭ."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Śpis udzielnikaŭ"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Śpis administrataraŭ"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6136,11 +6321,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Dadajecca ŭdzielnik..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6148,11 +6333,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6160,11 +6345,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6172,14 +6357,15 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Mahčymyja varyjanty:\n"
 "1. karystalnik@damen/krynica (tolki hetaja krynica).\n"
@@ -6188,85 +6374,92 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Kali łaska, pravier, ci vyznačanyja pali servera i pakoju, albo vydal hetuju "
 "zakładku."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Mianuška nie dazvolenaja: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Taki JID užo vykarystoŭvajecca"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Hety kont užo naładžany dla Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Niapravilny zapis"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6275,27 +6468,34 @@ msgstr ""
 "Možaš źmianić dadatkovyja nałady kontu, nacisnuŭšy zaraz knopku \"Dadatkovyja"
 "\", albo paźniej, abraŭšy \"Źmianić\"->\"Konty\" ŭ menu hałoŭnaha akna."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Novy kont paśpiachova stvorany"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6305,7 +6505,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6313,30 +6513,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Novy kont paśpiachova stvorany"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Dziejny"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Padzieja"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Atrymanaje pieršaje paviedamleńnie"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Atrymanaje novaje paviedamleńnie"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Atrymanaje novaje paviedamleńnie"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kantakt dałučyŭsia"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kantakt adłučyŭsia"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Paviedamleńnie dasłanaje"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Novaje paviedamleńnie ŭ pakoji"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Novy list na skryncy GMail"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6345,75 +6587,75 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Skonč pracu"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "U adrasie słoŭnika nie staje \"%s\", i heta nia Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Učora"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dzion tamu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Klijent kamunikacyi dla Jabber"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6428,146 +6670,146 @@ msgstr "Nazva kantaktu: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Hrupa"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "U hrupie"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "ID kluča"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nazva kantaktu"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Vyznač MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Paviedamleńnie statusu %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Paviedamleńnie statusu"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Kont z takoj nazvaj užo zaniaty. Kali łaska, abiary inšuju nazvu."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Zapišy jak šablon paviedamleńnia statusu"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Kali łaska, uviadzi nazvu dla hetaha paviedamleńnia statusu"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Adras AIM:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Adras MSN:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Adras Yahoo!:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Kali łaska, zapoŭni źviestki ab kantakcie, kali chočaš dadać kantakt %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Kali łaska, zapoŭni źviestki ab kantakcie, jaki chočaš dadać"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Jabber-klijent dla GTK+"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I ŭrešcie, chočacca padziakavać usim apiekunam pakietaŭ."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6578,95 +6820,95 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zapyt aŭtaryzacyi dla kontu %s ad %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Niemahčyma ŭdzielničać u hrupavoj razmovie, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
@@ -6675,277 +6917,303 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Kali łaska, pravier, ci jość złučeńnie z \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Niemahčyma źmianić parol, nie dałučyŭšysia da servera."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Novaje paviedamleńnie"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Novaje asobnaje paviedamleńnie"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Novaje pryvatnaje paviedamleńnie"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Я %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Kansol XML"
 
-#: ../src/dialogs.py:2568
+#. 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 "Ja chaču dadać Vas u svoj śpis kantaktaŭ."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Adras"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Madyfikuj"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "JID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Hrupa"
+
+#. 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 "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Paradak: %s, dziejańnie: %s, typ: %s, vartaść: %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Umova"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "kali maju "
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6953,38 +7221,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6994,58 +7262,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Inšyja"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Kanferencyja"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Nia možaš prahladać najaŭnyja servisy, nie dałučyŭšysia da servera"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7053,317 +7321,341 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Prahladaj"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykanaj zahad..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanavańnie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Karystalniki"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Apisańnie"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Zakładka ŭžo dadana"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Zakładka paśpiachova dadanaja"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Zahady: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Šyfravańnie OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Paroli roźniacca"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Madyfikacyja kontu"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Identyfikatar"
+msgid "Automatic status"
+msgstr "_Dastasuj da statusu"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Šyfravańnie OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "_Uvachodnaje paviedamleńnie:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ahulnaja"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Zdolnaści serveraŭ"
@@ -7393,7 +7685,7 @@ msgstr "Pamier: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Ty"
 
@@ -7403,7 +7695,7 @@ msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
@@ -7435,27 +7727,28 @@ msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Pieradača fajłu spyniena inšym bokam"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Pieradača fajłu spyniena"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Apisańnie: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim nia moža dastupicca da hetaha fajłu"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Hety fajł vykarystoŭvajecca inšym pracesam."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fajł: %s"
@@ -7475,12 +7768,12 @@ msgstr "Apisańnie: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
@@ -7488,22 +7781,22 @@ msgstr ""
 "Fajł z takoj nazvaj užo isnuje, i nie staje pravoŭ dla nadpisańnia hetaha "
 "fajłu."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Što chočaš zrabić?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
@@ -7539,52 +7832,52 @@ msgstr "Fajł: "
 msgid "It is not possible to send empty files"
 msgstr "Niemahčyma dasyłać pustyja fajły"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nazva:"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Prypyni"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu patrebny X-server. Vychad..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Biblijateka GTK+ nie padtrymvaje libglade"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7593,22 +7886,22 @@ msgstr ""
 "Kali łaska, vydal biblijateku GTK+ i zainstaluj najnoŭšuju stabilnuju "
 "versiju z %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Kali łaska, pravier, ci padtrymvajuć srodki libpango biblijateki GTK+ i "
 "PyGTK."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajimu treba PySQLite2"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7618,11 +7911,11 @@ msgstr ""
 "ściahnuć z %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim užo vykonvajecca"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7630,25 +7923,34 @@ msgstr ""
 "Gajim užo vykonvajecca\n"
 "Usio adno ŭruchomić?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vyznač parol GPG dla kontu %s."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Ty dałučyśsia da %s biaz OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7658,141 +7960,180 @@ msgstr ""
 "Hetaja mianuška vykarystoŭvajecca ci zarehistravanaja na inšuju asobu.\n"
 "Kali łaska, vyznač inšuju mianušku nižej:"
 
-#: ../src/gajim.py:571
+#: ../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 "Prymaješ hety zapyt?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Zapyt aŭtaryzacyi"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kantakt \"%s\" aŭtaryzavaŭ ciabie, i ciapier ty možaš bačyć jaho status."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Anuluj aŭtaryzacyju"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s ciapier viadomy jak %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 maje ciapier status %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Treba ŭvieści parol, kab dałučycca da pakoju."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "_Bolš nie pytajsia"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
+"źmiennaja asiarodździa niapravilna akreślenaja)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7800,7 +8141,7 @@ msgstr[0] "%d novy list"
 msgstr[1] "%d novyja listy"
 msgstr[2] "%d novych listoŭ"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7810,82 +8151,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Vydalaje kantakt sa śpisu"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Pamyłka adčytańnia fajłu:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Atrymany fajł %(filename)s ad %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s ad %(name)s spyniena."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Fajł %(filename)s paśpiachova dasłany da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Pieradača fajłu %(filename)s da %(name)s spynienaja."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Dla kožnaha _paviedamleńnia"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Kali łaska, akreśli novaje imia karystalnika dla lakalnaha kontu"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7893,130 +8244,107 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Złučeńnie"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "_Bolš nie pytajsia"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Niemahčyma dałučycca da pakoju, kali ty niabačny"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Zakładka ŭžo dadana"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Zakładka paśpiachova dadanaja"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Možaš kiravać svajimi zakładkami praz menu \"Dziejańni\" śpisu kantaktaŭ."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Pakazvaje daviedku pa akreślenym zahadzie"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "zahad"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "pakažy daviedku pa zahadzie"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Adčyniaje akno z nastupnym niečytanym paviedamleńniem"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8024,47 +8352,48 @@ msgstr ""
 "Pakazvaje śpis usich kantaktaŭ sa śpisu kantaktaŭ. Źviestki ab kožnym "
 "kantakcie źjaŭlajucca na novym radku"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "pakažy kantakty akreślenaha kontu"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Pakazvaje śpis zarehistravanych kontaŭ"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Źmianiaje status kontu albo kontaŭ"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "paviedamleńnie"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "paviedamlennie statusu"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8073,19 +8402,23 @@ msgstr ""
 "dla ŭsich kontaŭ, dla jakich vystaŭlenaja opcyja \"Synchranizuj z hlabalnym "
 "statusam\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Pakazvaje akno razmovy, kab dasyłać paviedamleńni kantaktu"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Kali akreślena, kantakt biarecca sa śpisu kantaktaŭ hetaha kontu"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8095,30 +8428,30 @@ msgstr ""
 "kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki 'kont', "
 "biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "kluč pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "Kali akreślena, paviedamleńnie budzie zašyfravana hetym publičnym klučom"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Kali akreślena, paviedamleńnie budzie dasłanaje z hetaha kontu"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8128,136 +8461,136 @@ msgstr ""
 "OpenPGP i kont nie abaviazkovyja dla akreśleńnia. Kali chočaš akreślić tolki "
 "'kont', biez 'kluča OpenPGP', tady prosta akreśli 'kluč OpenPGP' jak ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "tema paviedamleńnia"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID kantaktu, jaki atrymaje paviedamleńnie"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID kantaktu"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Atrymvaje padrabiaznyja źviestki ab kantakcie"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Nazva kontu"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Dasyłaje kantaktu fajł"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "fajł"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Ściežka da fajłu"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Kali akreślena, fajł budzie dasłany z hetaha kontu"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Pakazvaje ŭsie nałady i ichnyja vartaści"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Akreślivaje dla 'kluča' 'vartaść'"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "kluč=vartaść"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'kluč' jość nazvaj nałady, 'vartaść' jość vartaściu hetaj nałady"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Vydalaje naładu"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "kluč"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nazva vydalenaj nałady"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisvaje dziejnyja nałady Gajima ŭ fajł .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Dadaje kantakt u śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Dadaje novy kantakt dla hetaha kontu"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Viartaje dziejny status (hlabalny, kali nie akreśleny kont)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Viartaje dziejnaje paviedamleńnie statusu (hlabalnaha, kali nie akreśleny "
 "kont)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Viartaje kolkaść niečytanych paviedamleńniaŭ"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Adčyniaje akno 'Pačni razmovu'"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Pačynaje razmovu dla hetaha kontu"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Dasyłaje svoj XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML dla dasyłańnia"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8265,72 +8598,77 @@ msgstr ""
 "Kont, na jaki budzie dasłany XML; kali kont nie akreśleny, XML budzie "
 "dasłany na ŭsie konty"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Absłuhoŭvaj spasyłki xmpp:/"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "źmiest paviedamleńnia"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Dałučysia da pakoju"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "pakoj"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Pakoj:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "mianuška"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "parol"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Paroli roźniacca"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8339,31 +8677,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8372,7 +8710,7 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8381,7 +8719,7 @@ msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8390,7 +8728,7 @@ msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Niapravilnaja spasyłka"
 
@@ -8408,177 +8746,180 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nazva temy"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Niemahčyma vydalić dziejnuju temu"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Pamyłka dasyłańnia pryvatnaha paviedamleńnia"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ciabie niama ŭ pakoji \"%s\", albo \"%s\" pakinuŭ jaho."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s zablakavaŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(who)s vypchnuŭ %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Niapravilnaje imia karystalnika"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Dla hetaha pakoju nie akreślena tema"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaprošany ŭ %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Mianuška nia znojdziena: %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 ""
 "Užyvańnie: /%s <mianyška|JID> [pryčyna], blakuje JID dla pakoju. Mianušku "
 "možna źmianić, kali jana nia ŭtrymlivaje znaka \"@\". Kali JID jašče "
 "znachodzicca ŭ pakoji, jon budzie vypchnuty preč. Prabieły ŭ mianuškach nie "
 "padtrymvajucca."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8587,7 +8928,7 @@ msgstr ""
 "Užyvańnie: /%s <mianuška>, adčyniaje akno pryvatnaj razmovy z akreślenaj "
 "asobaj."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8596,7 +8937,7 @@ msgstr ""
 "Užyvańnie: /%s [pryčyna], začyniaje dziejnaje akno albo kartku, pakazaŭšy "
 "akreślenuju pryčynu."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8605,7 +8946,7 @@ msgstr ""
 "Užyvańnie: /%s <JID> [pryčyna], zaprašaje JID u dziejny pakoj, z akreślenym "
 "tłumačeńniem."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8614,17 +8955,16 @@ msgstr ""
 "Užyvańnie: /%s <pakoj>@<server>[/mianuška], dałučajecca da pakoju "
 "pakoj@server z akreślenaj mianuškaj."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Užyvańnie: /%s <mianuška> [pryčyna], vypichvaje asobu z takoj mianuškaj z "
 "pakoju z akreślenaj pryčynaj. Prabieły ŭ mianuškach nie padtrymvajucca."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8633,24 +8973,24 @@ msgstr ""
 "Užyvańnie: /%s <mianuška> [paviedamleńnie], adčyniaje akno pryvatnaj razmovy "
 "i dasyłaje paviedamleńnie asobie z akreślenaj mianuškaj."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Užyvańnie: /%s, pakazvaje imiony naviednikaŭ pakoju."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Užyvańnie: /%s [tema], pakazvaje albo aktualizuje dziejnuju temu pakoju."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8658,60 +8998,75 @@ msgstr ""
 "Užyvańnie: /%s <paviedamleńnie>, dasyłaje paviedamleńnie, nie šukajučy "
 "inšych zahadaŭ."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 ""
+"Užyvańnie: /%s <mianuška>, źmianiaje tvaju mianušku dla dziejnaja pakoju."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Kali začyniš hetaje akno, adłučyśsia ad pakoju."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
@@ -8742,82 +9097,82 @@ msgstr "Padrabiaznaści"
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Pamyłka razboru fajłu:"
 
 #. 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 "Niemahčyma zapisać u %s. Kiravańnie sesijami nia budzie dziejničać"
 
 #. 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 nie akreśleny jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chočaš zrabić Gajim zmoŭčanym klijentam 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 "Zaŭsiody praviaraj, ci akreśleny Gajim jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../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 ""
 "Niemahčyma zapisać vyjavu ŭ farmacie %(type)s. Zapisać jak %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kantakty"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Mianuška"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Paviedamleńnie"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Chočaš ačyścić bazu źviestak? (NIE REKAMENDUJECCA RABIĆ Z AKTYŬNYM GAJIMAM)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8831,233 +9186,234 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Ekspartavańnie žurnałaŭ..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s a %(time)s napisaŭ: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Sapraŭdy chočaš vydalić žurnał razmoŭ z abranym kantaktam?"
 msgstr[1] "Sapraŭdy chočaš vydalić žurnały razmoŭ z abranymi kantaktami?"
 msgstr[2] "Sapraŭdy chočaš vydalić žurnały razmoŭ z abranymi kantaktami?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Vynikaŭ hetaj aperacyi niemahčyma anulavać."
 
-#: ../src/history_manager.py:585
+#: ../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] "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
 msgstr[1] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 msgstr[2] "Sapraŭdy chočaš vydalić zaznačanyja paviedamleńni?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Žurnał razmoŭ z %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s maje ciapier status %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Dziejny status: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Niama złučeńnia z serveram"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Sapraŭdy chočaš vydalić zaznačanaje paviedamleńnie?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Paviedamleńni"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Novaje pryvatnaje paviedamleńnie ŭ pakoji %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Ahulnaja"
+msgid "Ignore"
+msgstr "dziaviataja"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Źviestki atrymanyja"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Niemahčyma apublikavać asabistyja źviestki, nie dałučyŭšysia da servera."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Dasyłańnie profilu..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Źviestki NIE apublikavanyja"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Pamyłka publikacyi vCard"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Kali \"%s\" zadavolić tvoj zapyt, ty zmožaš bačyć jahony status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ciapier \"%s\" budzie zaŭsiody bačyć ciabie jak adłučanaha."
 
-#: ../src/roster_window.py:1920
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Kiraŭnik parolaŭ GNOME instalavany, ale niapravilna vykonvajecca (mahčyma, "
-"źmiennaja asiarodździa niapravilna akreślenaja)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9065,15 +9421,28 @@ msgstr ""
 "Źmianiŭšy status na niabačny, ty adłučyśsia ad hetych pakojaŭ. Ty sapraŭdy "
 "chočaš stać niabačnym?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Ty sapraŭdy chočaš pakinuć pakoj \"%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 "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9082,16 +9451,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9099,11 +9468,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9113,52 +9482,57 @@ msgstr ""
 "transpartami:%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chočaš vydalić hrupu %s sa śpisu kantaktaŭ?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Vydal taksama ŭsie kantakty z hetaj hrupy sa śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9167,12 +9541,12 @@ msgstr ""
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9180,16 +9554,16 @@ msgstr ""
 "Vydaliŭšy hety kantakt, ty zmoŭčana taksama anuluješ jahonuju aŭtaryzacyju. "
 "U vyniku jon zaŭsiody budzie bačyć ciabie adłučanym."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Ja chaču, kab hety kantakt moh bačyć moj status paśla vydaleńnia"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9199,19 +9573,19 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Treba stvaryć kont, kab razmaŭlać ź inšymi kantaktami."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9220,12 +9594,12 @@ msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
 
-#: ../src/roster_window.py:3786
+#: ../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 "
@@ -9235,12 +9609,12 @@ msgstr ""
 "Zvyčajna hetaja mažlivaść vykarystoŭvajecca, kali adzin čałaviek "
 "karystajecca niekalkimi kontami Jabber albo niekalkimi kontami z transpartaŭ."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9248,137 +9622,138 @@ msgstr[0] "%s choča dasłać tabie fajł:"
 msgstr[1] "%s choča dasłać tabie fajł:"
 msgstr[2] "%s choča dasłać tabie fajł:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Dašli %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Zrabi z %s i %s metakantakt"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "praz kont %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "da kontu %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "praz kont %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Kiruj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "kontu %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "dla kontu %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Dziejny"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Šukaj servisy..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
@@ -9395,20 +9770,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9418,7 +9793,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9428,129 +9803,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "Ź_miani paviedamleńnie statusu..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "JID:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Krynica: "
 
-#: ../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 hetaha pakoju"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../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 "Apošni status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " ad %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Złučeńnie"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Aŭtaryzacyja: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Pakoj:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Dziejny"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Typ:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Ściahni"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Zaciahni na server"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Pierasłany: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Nie pačata"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Spyniena"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Zavieršana"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?status pieradačy:Prypyniena"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Zatrymana"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Pieradajecca"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: ../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"
@@ -9566,55 +9931,119 @@ msgstr "?Klijent:Nieviadomy"
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Klijent:Nieviadomy"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "ad %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Hety kantakt cikavicca tvajim statusam, ale ciabie jahony status nie cikavić"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 "Ty cikaviśsia statusam hetaha kantaktu, ale jaho nie cikavić tvoj status"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Ty i hety kantakt uzajemna cikaviciesia statusam adno adnaho"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ty i hety kantakt nie cikaviciesia statusam adno adnaho"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Šyfravańnie OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Pstykni, kab pahladzieć zdolnaści serveraŭ Jabber (naprykład, šluzy MSN, "
+#~ "ICQ)"
+
+#~ msgid "Servers Features"
+#~ msgstr "Zdolnaści serveraŭ"
+
+#~ msgid "Your JID:"
+#~ msgstr "Vaš JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Nazva:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Pakažy _śpis kantaktaŭ"
+
+#~ msgid "Modify Account"
+#~ msgstr "Madyfikuj kont"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" ŭ vykanańni %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Kont Gajim %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Asablivy</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Taki JID užo vykarystoŭvajecca"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Hety kont užo naładžany dla Gajim."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Identyfikatar"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Pieradača fajłu spyniena inšym bokam"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Ahulnaja"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Dziejny"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr ""
@@ -9642,9 +10071,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "_Retype Password:"
 #~ msgstr "Paŭta_ry parol:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "S_karystaj proxy"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9818,9 +10244,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Pašyranaje kiravańnie nahadvańniami..."
 
-#~ msgid "_Font:"
-#~ msgstr "_Šryft:"
-
 #~ msgid "_Never"
 #~ msgstr "_Nikoli"
 
@@ -9833,12 +10256,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "_Pop it up"
 #~ msgstr "_Vynyrni"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
-#~ msgid "Address"
-#~ msgstr "Adras"
-
 #~ msgid "City:"
 #~ msgstr "Horad:"
 
@@ -9962,9 +10379,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Pieraniasi %s u hrupu %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Zrabi z %s i %s metakantakt"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Chavaje knopki ŭ aknie pryvatnaj razmovy."
 
@@ -9993,9 +10407,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgstr[1] "%d niečytanyja pryvatnyja paviedamleńni"
 #~ msgstr[2] "%d niečytanych pryvatnych paviedamleńniaŭ"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Niemahčyma złučycca z hostam: Niapravilny adkaz servera."
diff --git a/po/bg.po b/po/bg.po
index c97fb6598..051a7f330 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,15 +1,15 @@
 # Bulgarian translation of Gajim.
 # Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Gajim package.
-# Yavor Doganov <yavor@gnu.org>, 2005, 2006, 2007, 2008.
 #
 #
+# Yavor Doganov <yavor@gnu.org>, 2005, 2006, 2007, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-02 21:52+0100\n"
-"PO-Revision-Date: 2008-12-02 22:33+0200\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:43+0200\n"
 "Last-Translator: Yavor Doganov <yavor@gnu.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
@@ -39,7 +39,7 @@ msgid "_Add Contact..."
 msgstr "_Добавяне на контакт…"
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
@@ -60,7 +60,7 @@ msgid "_Personal Events"
 msgstr "_Лични събития"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Започване на разговор…"
 
@@ -92,6 +92,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Изберете сървър</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"
@@ -99,61 +103,54 @@ msgstr ""
 "Добавяне на този сертификат към списъка с доверени сертификати.\n"
 "Отпечатък тип SHA1 на сертификата:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Натиснете, за да видите функционалностите (като MSN, ICQ транспорти) на "
-"Джабър сървърите"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Използване на удостоверяване"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Свързване при натискане на бутона „Приключване“"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "_Вече имам регистриран акаунт, който искам да използвам"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Управление на…"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "_Сървър-посредник:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Функционалности на сървърите"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Настройване на профила при свързване"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Използване на нестандартен хост/порт"
 
@@ -166,30 +163,31 @@ msgstr ""
 "мрежата на Джабър."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Вашия JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Хост:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Парола:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "По_рт:"
 
@@ -197,11 +195,6 @@ msgstr "По_рт:"
 msgid "_Server:"
 msgstr "С_ървър:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "И_ме на потребител:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -210,18 +203,16 @@ msgstr "<b>Разни</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Лични данни</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Акаунт"
 
@@ -230,23 +221,22 @@ msgid "Account Modification"
 msgstr "Промяна на акаунт"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Административни операции"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Автоматично свързване при разпадане на връзката"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "С_вързване при стартиране"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Пром_яна на парола"
 
@@ -263,38 +253,36 @@ msgstr ""
 "изключвате TLS."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Избор на _ключ…"
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Натиснете, за да смените паролата на акаунта"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Натиснете, за да изискате упълномощаване от всички контакти на друг акаунт"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Свързване"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни…"
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:516 ../src/notify.py:547
-#: ../src/notify.py:559
+#: ../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"
 
@@ -302,17 +290,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2660
-#: ../src/roster_window.py:5144
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Общи"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Хост: "
 
@@ -335,7 +320,6 @@ msgstr ""
 "с цел избягване на разпадането ѝ."
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -345,7 +329,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -355,7 +338,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -370,43 +352,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Вашите лични данни, както са запазени на сървъра"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2051
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1141
-#: ../src/config.py:1212 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050
-#: ../src/config.py:3141 ../src/config.py:3209 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2729
-#: ../src/roster_window.py:2735 ../src/roster_window.py:2740
+#: ../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 "Няма"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Лични данни"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Порт: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -417,7 +401,7 @@ msgstr ""
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Приоритетът ще се сменя автоматично в зависимост от състоянието ви."
 
@@ -426,12 +410,12 @@ msgid "Proxy:"
 msgstr "Сървър-посредник:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "_Ресурс:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -446,30 +430,25 @@ msgstr ""
 "приоритет ще получава събитията. (вижте по-долу)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Запазване на _паролата (рисковано за сигурността)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Синхронизиране на контакти"
@@ -479,21 +458,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Използване на _SSL (извън употреба)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Използване на сървъри-посредници за файлови трансфери"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Съгласуване спрямо състоянието"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Име:"
 
@@ -501,11 +475,21 @@ msgstr "_Име:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Сървър-посредник</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Съгласуване спрямо състоянието"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Акаунти"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Използване на удостоверяване"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -513,21 +497,18 @@ msgstr ""
 "Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
 "паролата ви чрез несигурна връзка."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "С_вързване при стартиране"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Е-поща:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Активиране"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Собствено име:"
 
@@ -537,7 +518,6 @@ msgstr ""
 "Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -548,56 +528,98 @@ msgstr ""
 "Може да помислите и да промените настройките на огнената стена, евентуално."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Фамилия:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Смесване на акаунти"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5095
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Пре_именуване"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Изпращане на пакети за поддържане на връзката"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Използване на агент на _GPG"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Използване на нестандартен хост/порт"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Използване на нестандартен порт:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Редактиране на личните данни…"
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Активиране"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Хост:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Управление на…"
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "По_рт:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "Предупре_ждаване преди използване на несигурна връзка"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Акаунт:"
@@ -784,7 +806,7 @@ msgid "All statuses"
 msgstr "Всички състояния"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Отсъствам"
 
@@ -801,7 +823,7 @@ msgid "Have "
 msgstr "имам "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Невидим"
 
@@ -810,7 +832,7 @@ msgid "Launch a command"
 msgstr "Изпълнение на команда"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
@@ -931,7 +953,7 @@ msgstr "Последно променена:"
 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 "Получихте нов запис:"
 
@@ -975,11 +997,19 @@ msgstr "Въведете нова парола:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Напишете новото съобщение за състояние</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 "Дейност:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Настроение:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Настроени съобщения:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Запазване като настроено…"
 
@@ -1014,50 +1044,36 @@ msgstr "_Отваряне на връзката в браузър"
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
-#. Execute Command
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5682
-msgid "Execute Command..."
-msgstr "Изпълнение на команда…"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
 msgid "Invite _Contacts"
 msgstr "Покана на _контакти"
 
-#. Send Custom Status
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5060 ../src/roster_window.py:5648
-msgid "Send Cus_tom Status"
-msgstr "Изпращане на _специфично състояние"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
 msgstr "Превключване на шифриране тип „End to End“"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Превключване на шифриране тип „Open_PGP“"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка…"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:8
+#: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5791
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "Ист_ория"
 
@@ -1202,7 +1218,7 @@ msgstr ""
 "Ред за контакт\n"
 "Лента за разговор"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:750
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Получер"
 
@@ -1222,11 +1238,11 @@ msgstr "Персонализиране на темите на Gajim"
 msgid "Gone"
 msgstr "Отсъства"
 
-#: ../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 "Бездеен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:751
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1274,7 +1290,7 @@ msgstr "Промяна на _темата…"
 msgid "Configure _Room..."
 msgstr "Настройки на _стаята…"
 
-#: ../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 "_Добавяне на стаята към отметките"
 
@@ -1306,23 +1322,37 @@ msgstr "_Администратор"
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../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 "_Блокиране"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Член"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "Со_бственик"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Изпращане на лично съобщение"
 
-#: ../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 "_Деблокиране"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Глас"
 
@@ -1330,13 +1360,13 @@ msgstr "_Глас"
 msgid "Create new post"
 msgstr "Създаване на ново съобщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "От"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Тема"
 
@@ -1355,7 +1385,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добре дошли в мениджъра на историята на разговорите</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 "Изтриване"
 
@@ -1385,7 +1416,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Търсене в базата от данни"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:314
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "История на разговорите"
 
@@ -1408,7 +1439,7 @@ msgstr "Търсене:"
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
-#: ../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 "Влизане в стая"
 
@@ -1435,8 +1466,8 @@ msgstr "Скоро посетени:"
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Влизане"
 
@@ -1464,7 +1495,7 @@ msgstr "Минимизиране при автоматично влизане"
 msgid "Print status:"
 msgstr "Изписване на състоянията:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Сървър:"
 
@@ -1493,36 +1524,54 @@ msgid "<b>Settings</b>"
 msgstr "<b>Настройки</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "Свързване по HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Име:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Паро_ла:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Тип:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Сървър-посредник:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Използване на удостоверяване"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "По_рт:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Хост:"
+msgid "Use HTTP prox_y"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Използване на удостоверяване"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "И_ме на потребител:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1572,7 +1621,7 @@ msgstr "Показване на профила на контакта (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 "_Изпращане"
 
@@ -1670,10 +1719,14 @@ msgstr ""
 "Зает/Невидим"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1687,19 +1740,19 @@ msgstr ""
 "Винаги да се използват стандартните програми на Xfce\n"
 "Персонални"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Съобщение от разговор:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Настройване на цвят и шрифт на интерфейса"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1713,31 +1766,31 @@ msgstr ""
 "Отделен списък и разговори, групирани по акаунт\n"
 "Отделен списък и разговори, групирани по вид"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Показване на _дейност на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Показване на _допълнителни данни за е-поща"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Показване на _слушаната от контактите музика в списъка"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Показване на _настроенията на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1747,7 +1800,7 @@ msgstr ""
 "даден контакт. Тук може да укажете кои състояния бихте искали да се показват "
 "в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1756,7 +1809,7 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1764,11 +1817,11 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Скриване на всички бутони в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1776,7 +1829,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1784,14 +1837,14 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
 "писма."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
 "компютърът не се използва."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1799,7 +1852,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
 "разположение“ когато компютърът не се използва по-дълго време."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1807,7 +1860,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
 "и стаите"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1815,28 +1868,28 @@ msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
 "списъка."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
 "списъка."
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
 "в списъка."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1847,7 +1900,7 @@ msgstr ""
 "натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
 "езикът по подразбиране."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1857,7 +1910,7 @@ msgstr ""
 "неупълномощени контакти. Използвайте я внимателно, тъй като блокира всички "
 "съобщения от всеки контакт, който не е в списъка."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1867,7 +1920,7 @@ msgstr ""
 "съобщение. Забележете, че при шифриране тип „E2E“ другата страна трябва да "
 "се съгласи, иначе съобщенията няма да бъдат запазвани."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1875,7 +1928,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще показва уведомление при получаването на "
 "ново писмо чрез GMail."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1885,7 +1938,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1893,7 +1946,7 @@ msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1901,43 +1954,50 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните анимирани или статични емотикони."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Запазване на дневник на _шифрираната сесия"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "_Компактни прозорци за разговор"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "_Управление…"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомяване за _включващи се контакти"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомяване за _изключващи се контакти"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Уведомяване при нова поща от _GMail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Лични събития"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1947,19 +2007,24 @@ msgstr ""
 "Уведомяване\n"
 "Показване само в списъка"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Показване на събитието в областта за _уведомяване"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Включване"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1967,139 +2032,145 @@ msgstr ""
 "Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
 "н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Състояние"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "_Набор икони за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
 "сменя текущото съобщение."
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
 "няма да се сменя текущото съобщение."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Използване на и_кони за транспортите"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Използване на стан_дартните за системата"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "При получаване на ново събитие:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "„_Отсъствам“ след:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "Показване на уведомления при _разговор:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Емотикони:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Файлов мениджър:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "В_ходящо съобщение:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Програма за е-поща:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "„Не съм на _разположение“ след:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Отваряне…"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Изходящо съобщение:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "Изпращане на уведомления при _разговор:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "С_ъобщение за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_Адреси:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Поведение на прозорците:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "в _стаи"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "в с_писъка"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "минути"
 
@@ -2147,7 +2218,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ред:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
@@ -2212,108 +2283,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Фирма:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Държава:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Отдел:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Е-поща:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Допълнителен адрес:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Фамилия:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Име</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Собствено:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Страница в Интернет:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Презиме:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Име:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Псевдоним:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Телефон:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Дейност:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Пощенски код:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Представка:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Роля:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Област/Щат:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Улица:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Наставка:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Относно"
 
@@ -2323,17 +2394,17 @@ msgstr "Натиснете, за да настроите аватара си"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Лични данни"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Работа"
 
@@ -2351,8 +2422,8 @@ msgstr "Премахване на акаунт от Gajim и от с_ървър�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5132
-#: ../src/roster_window.py:5610 ../src/roster_window.py:5739
+#: ../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 "_Премахване"
 
@@ -2372,10 +2443,16 @@ msgstr "Задаване на ключ Open_PGP…"
 msgid "Edit _Groups..."
 msgstr "Редактиране на _групи…"
 
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5815
+msgid "Execute Command..."
+msgstr "Изпълнение на команда…"
+
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5050 ../src/roster_window.py:5563
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "По_кана в"
 
@@ -2383,6 +2460,12 @@ msgstr "По_кана в"
 msgid "Remo_ve"
 msgstr "П_ремахване"
 
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
+msgid "Send Cus_tom Status"
+msgstr "Изпращане на _специфично състояние"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Изпращане на _еднократно съобщение…"
@@ -2404,12 +2487,6 @@ msgstr "Започване на _разговор"
 msgid "_Allow him/her to see my status"
 msgstr "_Позволение за виждане на състоянието ми"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5123 ../src/roster_window.py:5600
-#: ../src/roster_window.py:5729
-msgid "_Block"
-msgstr "_Блокиране"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "За_брана за виждане на състоянието ми"
@@ -2431,16 +2508,34 @@ msgstr "_Преименуване…"
 msgid "_Subscription"
 msgstr "_Записване"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5117 ../src/roster_window.py:5594
-#: ../src/roster_window.py:5726
-msgid "_Unblock"
-msgstr "_Деблокиране"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Премахване на игнорирането"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Добавяне на контакт…"
@@ -2466,56 +2561,62 @@ msgid "Profile, A_vatar"
 msgstr "_Профил, аватар"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Показване на изкл_ючените контакти"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Показване на т_ранспорти"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "П_оказване на списъка"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Акаунти"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "Помо_щ"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Изход"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "Изпращане на _еднократно съобщение…"
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Изглед"
 
@@ -2532,11 +2633,11 @@ msgid "_Add contact"
 msgstr "Добавяне на _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5751
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Информация"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Търсене"
 
@@ -2623,11 +2724,6 @@ msgstr "Искане за записване"
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-#, fuzzy
-msgid "Select the account with which to synchronise"
-msgstr "Изберете акаунт, с който искате да синхронизирате"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Изберете акаунт, с който искате да синхронизирате"
@@ -2652,10 +2748,6 @@ msgstr "Изпращане на _еднократно съобщение"
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "П_оказване на списъка"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "С_ъстояние"
@@ -2673,49 +2765,54 @@ msgstr "<b>Запитване:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Клиент:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Област/Щат:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Състояние:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Записване:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Система:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Коментари"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Настроен аватар:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Информация за контакта"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Още"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Аватар:"
 
@@ -2727,6 +2824,11 @@ msgstr "<b>Джабър трафик</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Вход в XML формат</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Активиране"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2755,13 +2857,13 @@ msgstr "Задаване на ключ на Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5583
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5709
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Преименуване"
 
@@ -2785,29 +2887,25 @@ msgstr "Ресурс:"
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Промяна на акаунт"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Отмяна на потвърждението"
 
-#: ../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 "На път сте да изпълните команда. Наистина ли искате да я отмените?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Услугата промени идентификатора на сесията."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Услугата изпрати лошо форматирани данни"
 
+#: ../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 "Услугата върна грешка."
 
@@ -2832,7 +2930,7 @@ msgstr "Число"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:770
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Цвят"
 
@@ -2857,174 +2955,197 @@ msgstr "(Няма)"
 msgid "Hidden"
 msgstr "Скрита"
 
+#: ../src/atom_window.py:110
+#, fuzzy, 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 "английски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "белоруски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "български"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "бретонски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "чешки"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "немски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "гръцки"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "британски английски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "есперанто"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "испански"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "баски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "френски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "хърватски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "италиански"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "норвежки (Bokmål)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "холандски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "норвежки (Nynorsk)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "полски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "португалски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "бразилски португалски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "руски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "сръбски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "словашки"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "шведски"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "китайски"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
 
 #. we are not connected
-#: ../src/chat_control.py:358 ../src/chat_control.py:553
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:359 ../src/chat_control.py:554
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:752
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Неопределен"
 
-#: ../src/chat_control.py:753
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Болен"
 
-#: ../src/chat_control.py:776
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:785
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информация за контакта"
 
-#: ../src/chat_control.py:1215 ../src/chat_control.py:1617
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Наистина ли да се изпрати файла?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Шифрирането чрез GPG е включено"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1244 ../src/chat_control.py:2111
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:861
-#: ../src/dialogs.py:903 ../src/gajim.py:980 ../src/gajim.py:1640
-#: ../src/normal_control.py:483 ../src/roster_window.py:911
-#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1871 ../src/roster_window.py:3098
-#: ../src/roster_window.py:3121 ../src/roster_window.py:5244
-#: ../src/roster_window.py:5429
+#: ../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 "Не е в списъка"
 
-#: ../src/chat_control.py:1376 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
+
+#: ../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 "Неизвестен изпълнител"
 
-#: ../src/chat_control.py:1378 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Неизвестно заглавие"
 
-#: ../src/chat_control.py:1380 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Неизвестен източник"
 
-#: ../src/chat_control.py:1384 ../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"
@@ -3033,26 +3154,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> на <i>%(artist)s</i>\n"
 "от <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1389
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s на %(artist)s\n"
-"от %(source)s"
-
-#: ../src/chat_control.py:1512
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s от стая %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1597 ../src/dialogs.py:3907
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/chat_control.py:1598
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3060,50 +3172,50 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщенията с GPG."
 
-#: ../src/chat_control.py:1607
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Шифрирането чрез GPG е изключено"
 
-#: ../src/chat_control.py:1632
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "ЩЕ СЕ запазва дневник за сесията"
 
-#: ../src/chat_control.py:1634
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "НЯМА да се запазва дневник за сесията"
 
 #. encryption %s active
-#: ../src/chat_control.py:1648
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "е"
 
-#: ../src/chat_control.py:1648
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "НЕ е"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1650
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "Ще"
 
-#: ../src/chat_control.py:1650
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "НЯМА да"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1654
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1658
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "и удостоверяването НЕ Е успешно"
 
 #. 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:1664
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3112,26 +3224,26 @@ msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: ../src/chat_control.py:1712
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Командата не се поддържа за акаунт тип „zeroconf“."
 
-#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1651
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1665
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1670
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Употреба: /%s, скрива бутоните за разговор."
 
-#: ../src/chat_control.py:1732 ../src/groupchat_control.py:1686
+#: ../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 "
@@ -3140,38 +3252,38 @@ msgstr ""
 "Употреба: /%(command)s <действие>, изпраща действие до текущата стая. "
 "Използва се трето лице (напр. „/%(command)s експлодира“)."
 
-#: ../src/chat_control.py:1737
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Употреба: /%s, изпраща „ping“ до контакта."
 
-#: ../src/chat_control.py:1740
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Употреба: /%s, изпраща съобщение до контакта."
 
-#: ../src/chat_control.py:1743 ../src/groupchat_control.py:1709
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Няма помощна информация за /%s"
 
-#: ../src/chat_control.py:1875
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: ../src/chat_control.py:1885
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: ../src/chat_control.py:1887
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: ../src/chat_control.py:1892
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3179,25 +3291,25 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: ../src/chat_control.py:1894
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: ../src/chat_control.py:1922 ../src/chat_control.py:1935
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#: ../src/chat_control.py:1928
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Следното съобщение беше шифрирано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2299
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:2300
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3205,15 +3317,15 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/chat_control.py:2448 ../src/common/connection_handlers.py:1845
-#: ../src/common/connection_handlers.py:1891
-#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2212 ../src/common/connection.py:1215
-#: ../src/gajim.py:174
+#: ../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 "Грешка в базата от данни"
 
-#: ../src/chat_control.py:2449
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3222,7 +3334,7 @@ msgstr ""
 "Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
 "поправите или изтриете (цялата история ще бъде загубена)."
 
-#: ../src/chat_control.py:2685
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
@@ -3231,139 +3343,151 @@ msgstr "%(name)s вече е %(status)s"
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../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 e файл, а би трябвало да е папка"
 
-#: ../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 "Спиране на програмата"
 
-#: ../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 e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Промяна на информацията за състоянието"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Промяна на състоянието"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Настройване на съобщението за състояние и описанието му"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "На линия"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Не съм на разположение"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Не ме притеснявайте"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Изключен - изключване"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Описание на състоянието:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Състоянието беше променено."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Излизане от стаите"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s от стая %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Не сте влезли в стая."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Изберете стаите, които искате да напуснете"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:785
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:5020
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Стаи"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Напуснахте следните стаи:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Препращане на непрочетени съобщения"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Всички непрочетени съобщения бяха препратени."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Използване на DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Отсъствам поради липса на активност над $T мин)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Не съм на разположение поради липса на активност над $T мин)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S ще бъде заменено от текущото съобщение за състояние, а $T от времето на "
 "отсъствие."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3371,22 +3495,22 @@ msgstr ""
 "свиват автоматично."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:452
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3128
+#: ../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 "по подразбиране"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 "Активиране на съобщения от/за локални потребители (link-local/zeroconf)"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Език, който да се използва за проверката на правописа"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3397,7 +3521,7 @@ msgstr ""
 "„print_ichat_every_foo_minutes“.\n"
 "„never“ - никога да не се изписва часа."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3408,18 +3532,18 @@ msgstr ""
 "1 е най-прецизния часовник, 4 е най-относителния. Това е в сила само ако "
 "опцията „print_time“ е настроена на „sometimes“."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Тълкуване на двойки от „* / _“ като възможни символи за форматиране."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е активирана, не се премахват */_. Така *абв* ще е в получер стил, но "
 "със символите * *."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3430,7 +3554,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ако искате да използвате "
 "това, инсталирайте docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3438,7 +3562,7 @@ msgstr ""
 "Знак за добавяне след името на псевдонима при използване на автоматично "
 "допълване (TAB) в стая."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3446,7 +3570,7 @@ msgstr ""
 "Знак, който да се предложи да бъде добавен след желания псевдоним, когато "
 "той вече е използван от някой в стаята."
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3457,19 +3581,19 @@ msgstr ""
 "документацията на Питон относно „strftime“ за повече информация: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Знаци, които се изобразяват в разговори преди псевдонима"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Знаци, които се изобразяват в разговори след псевдонима"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3477,21 +3601,21 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "Изпращане на съобщение при Ctrl+Enter и нов ред с „Enter“."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3500,13 +3624,13 @@ msgstr ""
 "Или определен адрес, съдържащ %s, където %s е думата/фразата, или "
 "„WIKTIONARY“, което означава използване на wiktionary."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3518,14 +3642,14 @@ msgstr ""
 "„listen_to_network_manager“ и се синхронизират с общото състояние) в "
 "зависимост от състоянието на мрежовата връзка."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Изпращане на уведомления за състоянието на разговор. Може да бъде „all“, "
 "„composing_only“, „disabled“."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3533,7 +3657,7 @@ msgstr ""
 "Показвани уведомления за състоянието на разговора в прозорците за разговор. "
 "Може да бъде „all“, „composing_only“, „disabled“."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3541,11 +3665,11 @@ msgstr ""
 "Когато не се изписва часа на всяко съобщение („print_time“ е настроено на "
 "„sometimes“), да се показва на всеки x минути."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3553,7 +3677,7 @@ msgstr ""
 "Винаги да се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3561,7 +3685,13 @@ msgstr ""
 "Никога да не се пита преди затваряне на подпрозорец/прозорец на стая от този "
 "списък с адреси на стаи."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3570,35 +3700,27 @@ msgstr ""
 "към локалните интерфейси за файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Според стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Уведомяване за събития в областта за уведомяване."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Показване на границата на подпрозореца в прозорците за разговор?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
-"съобщения да се запазват в дневник?"
-
-#: ../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 "
@@ -3610,18 +3732,18 @@ msgstr ""
 "15, 16, 17 и 18. По-големите числа са по-сигурни, но изчисленията отнемат "
 "повече време в началото на сесията."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Показване на нови съобщения в изскачащ прозорец?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../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."
@@ -3630,14 +3752,14 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако е активирана, Gajim ще проверява дали е стандартния Джабър клиент при "
 "всяко стартиране."
 
-#: ../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."
@@ -3645,7 +3767,7 @@ msgstr ""
 "Ако е активирана, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3653,12 +3775,12 @@ msgstr ""
 "Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../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 ""
 "Позиция на аватара в списъка.  Може да е ляво (left) или дясно (right)."
 
-#: ../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."
@@ -3666,7 +3788,7 @@ msgstr ""
 "Ако е активирана, ще се изпраща запитване за аватар до всеки контакт, който "
 "е нямал такъв последния път или пък има остарял кеширан аватар."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3674,7 +3796,7 @@ msgstr ""
 "Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../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 "
@@ -3688,30 +3810,30 @@ msgstr ""
 "съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
 "в стаята“ или „Сульо напусна“."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Цвят на фона на контактите, които се включват."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Цвят на фона на контактите, които се изключват."
 
-#: ../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 "Да не се показва аватара на транспорта."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Да не се показва списъка в панела."
 
-#: ../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 "
@@ -3721,7 +3843,7 @@ msgstr ""
 "прозорецът ще мига (стандартното поведение при повечето мениджъри на "
 "прозорци) при задържане на чакащи събития."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3732,7 +3854,7 @@ msgstr ""
 "информация от тип SHA при присъствие в стаи."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3752,34 +3874,34 @@ msgstr ""
 "„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
 "специфичен прозорец."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
 "подпрозореца."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Скрива бутоните в прозорците за разговор."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрива лентата в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята."
 
-#: ../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."
@@ -3787,15 +3909,15 @@ msgstr ""
 "В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
 "който е написал предното съобщение."
 
-#: ../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
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прелистване на съобщение в прозореца за разговор"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3803,11 +3925,11 @@ msgstr ""
 "Списък с цветове, разделени с „:“, които да се използват за оцветяване на "
 "псевдонимите в стаите."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
 
-#: ../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."
@@ -3815,7 +3937,7 @@ 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 "
@@ -3825,7 +3947,7 @@ 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."
@@ -3833,7 +3955,16 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
+"keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3841,7 +3972,7 @@ msgstr ""
 "Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
 "в редовете за акаунти и групи."
 
-#: ../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"
@@ -3849,7 +3980,7 @@ msgstr ""
 "Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
 "съобщения се третират като от указания тип."
 
-#: ../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."
@@ -3858,7 +3989,7 @@ 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."
@@ -3866,13 +3997,13 @@ msgstr ""
 "Ако е активирана, Gajim ще преобразува чрез „dvips“ низа между $$ и $$ в "
 "изображение преди да го вмъкне в прозореца за разговор."
 
-#: ../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."
@@ -3880,7 +4011,7 @@ 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."
@@ -3888,11 +4019,11 @@ msgstr ""
 "Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
 "прикрепени към иконата в областта за уведомяване."
 
-#: ../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."
@@ -3900,16 +4031,22 @@ msgstr ""
 "Променете стойността за увеличаване или намаляване размера на изобразените "
 "формули на LaTeX. По-голяма стойност означава по-голям размер."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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."
@@ -3917,7 +4054,7 @@ msgstr ""
 "Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
 "Приоритетите се настройват в опциите „autopriority_*“."
 
-#: ../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"
@@ -3926,26 +4063,26 @@ msgstr ""
 "„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
 "„restore_last_status“ е изключена."
 
-#: ../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 ""
 "Ако е изключена, не се се подписват съобщенията за състояние с ключ на GPG, "
 "дори и да е конфигуриран."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Активира шифриране тип „ESessions“ за този акаунт."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
 
-#: ../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"
@@ -3953,37 +4090,46 @@ msgstr ""
 "Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
 "„ssl“ или „plain“."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показване на предупреждение преди използване на стандартната библиотека на "
 "SSL."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
 
-#: ../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
+#, fuzzy
 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 "Заобикалка заради 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."
@@ -3991,119 +4137,127 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../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:393
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
 
-#: ../src/common/config.py:395 ../src/common/config.py:398
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "„all“ или състояния, разделени с интервал"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "„yes“, „no“ или „both“"
 
-#: ../src/common/config.py:406 ../src/common/config.py:408
-#: ../src/common/config.py:409 ../src/common/config.py:412
-#: ../src/common/config.py:413
+#: ../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“ или „“"
 
-#: ../src/common/config.py:419 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:421 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:423 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: ../src/common/config.py:431 ../src/config.py:1391
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: ../src/common/config.py:434 ../src/common/config.py:435
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4111,68 +4265,99 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:459 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:71
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:91
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Грешен хост"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Невалиден локален адрес? :-O"
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1843
-#: ../src/common/connection_handlers.py:1889
-#: ../src/common/connection_handlers.py:2077
-#: ../src/common/connection_handlers.py:2210 ../src/common/connection.py:1213
-#: ../src/gajim.py:396
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Регистриране в %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Неуспех при свързването"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1134 ../src/common/connection.py:847
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Акаунтът „%s“ не поддържа невидимост."
 
-#: ../src/common/connection_handlers.py:1846
+#: ../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 "Невалиден Jabber ID"
+
 #: ../src/common/connection_handlers.py:1892
-#: ../src/common/connection_handlers.py:2080
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1216
-#: ../src/gajim.py:175
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr ""
+
+#: ../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."
@@ -4182,80 +4367,79 @@ msgstr ""
 "поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
 "(цялата история ще бъде загубена)."
 
-#: ../src/common/connection_handlers.py:1964
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Псевдонимът не е позволен: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2039
-#: ../src/common/connection_handlers.py:2042
-#: ../src/common/connection_handlers.py:2045
-#: ../src/common/connection_handlers.py:2048
-#: ../src/common/connection_handlers.py:2052 ../src/gajim.py:560
+#: ../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 "Неуспех при влизането в стаята"
 
-#: ../src/common/connection_handlers.py:2040
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вие сте отлъчени от стаята %s."
 
-#: ../src/common/connection_handlers.py:2043
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Стаята %s не съществува."
 
-#: ../src/common/connection_handlers.py:2046
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Създаването на стаи е ограничено."
 
-#: ../src/common/connection_handlers.py:2049
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
 
-#: ../src/common/connection_handlers.py:2053
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Не сте в списъка с членове на стаята %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2095
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Стаята е била унищожена"
 
-#: ../src/common/connection_handlers.py:2102
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: ../src/common/connection_handlers.py:2129
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2150
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "вече сме записани за %s"
 
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "вече сме отписани от %s"
 
-#: ../src/common/connection_handlers.py:2336
+#: ../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 "
@@ -4266,221 +4450,226 @@ msgstr ""
 "org/, за да го премахнете."
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2361
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2363
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1921 ../src/roster_window.py:1941
+#: ../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 "Ще бъдете свързани към „%s“ без OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Неуспех при получаването на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Неуспех при дешифрирането на подписа на сертификата"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Неуспех при дешифрирането на подписа на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Неуспех при декодирането на публичния ключ на издателя"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Грешка при проверката на подписа на сертификата"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "Грешка при проверката на подписа на списъка с отменени сертификати"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Сертификатът все още не е валиден"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Валидността на сертификата е изтекла"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "Списъкът с отменени сертификати все още не е валиден"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "Валидността на списъка с отменени сертификати е изтекла"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка при форматирането на полето „notBefore“ на сертификата"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка при форматирането на полето „notAfter“ на сертификата"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „lastUpdate“ на списъка с отменени "
 "сертификати"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 "Грешка при форматирането на полето „nextUpdate“ на списъка с отменени "
 "сертификати"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Изчерпана памет"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Само-подписан сертификат"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Само-подписан сертификат в удостоверителската верига"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "Неуспех при получаването на сертификата на издателя"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "Неуспех при проверката на първия сертификат"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Удостоверителската верига е твърде дълга"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Сертификатът е отменен"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Невалиден сертификат на удостоверителя"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Максималната дължина на пътя е надвишена"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Неподдържана цел на сертификата"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Сертификатът е отхвърлен"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Несъответствие на издателя на сертификата"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Несъответствие на идентификатора и сертифициращия орган"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Несъответствие на серийния номер на издателя и сертифициращия орган"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "Основната употреба не включва подписване на сертификати"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: %(error)"
 "s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: %"
 "(error)s"
 
-#: ../src/common/connection.py:521
-msgid "Connection to proxy failed"
-msgstr "Неуспех при свързването със сървъра-посредник"
-
-#: ../src/common/connection.py:609 ../src/common/connection.py:710
-#: ../src/common/connection.py:1348
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:610 ../src/gajim.py:1057
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/common/connection.py:642 ../src/common/connection.py:690
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Запазен в: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Неуспех при свързването със сървъра-посредник"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Неуспех при свързване с акаунт „%s“"
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: ../src/common/connection.py:665
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: ../src/common/connection.py:668
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4489,7 +4678,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:670
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4498,24 +4687,24 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: ../src/common/connection.py:711
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:736
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:738
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:799
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4524,25 +4713,30 @@ msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: ../src/common/connection.py:1092
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 "Не е възможно да бъдат изпращани празни файлове"
+
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 "Ключът на контакта (%s) не съвпада със зададения в Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1103
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
 
-#: ../src/common/connection.py:1203
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4551,20 +4745,30 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1381
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Покана на _контакти"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
-#: ../src/gajim.py:980
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Наблюдатели"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1349 ../src/gajim.py:806 ../src/roster_window.py:815
-#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
+#: ../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 "Транспорти"
 
@@ -4573,11 +4777,11 @@ msgid "Not in roster"
 msgstr "Не е в списъка"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Възможностите за D-Bus не могат да бъдат използвани"
 
@@ -4609,1043 +4813,1053 @@ msgstr ""
 "Липсва „session bus“.\n"
 "Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "дванадесет"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "един"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "два"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "три"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "четири"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "пет"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "шест"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "седем"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "осем"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "девет"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "десет"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "единадесет"
 
+#. 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 "дванадесет"
-
-#. 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 "$0 и пет"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s и пет"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 и десет"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s и десет"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 и петнадесет"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s и петнадесет"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 и двадесет"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s и двадесет"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 и двадесет и пет"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s и двадесет и пет"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 и половина"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s и половина"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$1 без двадесет и пет"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(1)s без двадесет и пет"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "$1 без двадесет"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "%(1)s без двадесет"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "$1 без петнадесет"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "%(1)s без петнадесет"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "$1 без десет"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "%(1)s без десет"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "$1 без пет"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "%(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 "Нощ"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Рано сутрин"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Сутрин"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Почти обед"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Обед"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Следобед"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Вечер"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Късно вечер"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Началото на седмицата"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Средата на седмицата"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Края на седмицата"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:119
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Собственик"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Член"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "пише съобщение…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " от стая %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " от потребител %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s не е валидно ниво за дневник"
+
 #. 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 "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Акаунт „%s“"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "за акаунт „%s“"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Изумен"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Страстен"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Ядосан"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Раздразнен"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Обезпокоен"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Възбуден"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Засрамен"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Отегчен"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Смел"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Спокоен"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Предпазлив"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Бездушен"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Уверен"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Объркан"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Замислен"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Спорещ"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Раздразнителен"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Луд"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Съзидателен"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Любопитен"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Обезсърчен"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Депресиран"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Разочарован"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Отвратен"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Шашнат"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Смутен"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Завистлив"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Развълнуван"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Склонен към флиртуване"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Разочарован"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Признателен"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Опечален"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Кисел"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Виновен"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Щастлив"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "С надежда"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Сгорещен"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Скромен"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Унизен"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Гладен"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Ранен"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Впечатлен"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Със страхопочитание"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Влюбен"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Възмутен"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Заинтересуван"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Пиян"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Непобедим"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Ревнив"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Самотен"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Безпомощен"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Късметлия"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Подъл"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Унил"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Нервен"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Безразличен"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Обиден"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Оскърбен"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Игрив"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Горд"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Отпуснат"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Облекчен"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Разкайващ се"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Неспокоен"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Тъжен"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Саркастичен"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Удовлетворен"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Сериозен"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Срамежлив"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Болен"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Сънен"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Спонтанен"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Стресиран"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Твърд"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Изненадан"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Благодарен"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Жаден"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Уморен"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Неопределен"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Слаб"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Обезпокоен"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Домакинствам"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Купувам хранителни продукти"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Чистя"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Готвя"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Ремонтирам"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Мия чиниите"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Пера"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Работя в градината"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Изпълнявам поръчка"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Разхождам кучето"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Пия"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Пия бира"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Пия кафе"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Пия чай"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Похапвам"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Закусвам"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Вечерям"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Обядвам"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Правя упражнения"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Карам велосипед"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Танцувам"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "На поход съм"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Тичам за здраве"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Спортувам"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Бягам"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Карам ски"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Плувам"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Тренирам"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Поддържам се"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "В Спа-центъра"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Мия си зъбите"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Подстригвам се"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Бръсна се"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Във ваната"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Взимам си душ"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "На среща"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Почивен ден"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Вися си"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Крия се"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "В отпуск"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Моля се"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Планиран отдих"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Мисля"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Почивам"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Ловя риба"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Играя"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Навън съм"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "На купон съм"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Чета"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Репетирам"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "На пазар съм"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Пуша"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Общувам"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "На плаж съм"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Гледам телевизия"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Гледам филм"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Разговарям"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "На четири очи"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Говоря по телефона"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Говоря по видеотелефона"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Пътувам"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Пътувам от/до работа"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Карам велосипед"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "В колата"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "В автобуса"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "В самолета"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "Във влака"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "На екскурзия"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Разхождам се"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Програмирам"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "На съвещание"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Уча"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Пиша"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Неуспех при свързването с порт %s."
 
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5654,7 +5868,7 @@ msgstr ""
 "бъде отменен."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5662,7 +5876,7 @@ msgstr ""
 "[Това е част от шифрирана сесия. Ако виждате това съобщение, нещо не е както "
 "трябва.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:91
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5671,17 +5885,17 @@ msgstr ""
 "Хостът „%s“, който сте конфигурирали в опцията „ft_add_hosts_to_send“, не е "
 "валиден, така че се пренебрегва."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Грешка на Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5691,31 +5905,31 @@ msgstr ""
 "Изпращането и получаването на съобщения тип „link-local“ може и да не "
 "функционира правилно."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверете дали Avahi или Bonjour е инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Неуспех при стартирането на локална услуга"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Неуспех при свързването с порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Проверете дали е стартиран avahi-daemon."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Неуспех при промяната на състоянието на акаунт „%s“"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5724,66 +5938,50 @@ msgstr ""
 "изпратено."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е шифрирано]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Съобщението ви не можа да бъде изпратено."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контактът е изключен. Съобщението ви не можа да бъде изпратено."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Неуспех при установяването на връзка с хоста: Изтичане на допустимото време "
 "при изпращането на данните."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:195
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Грешка при добавянето на услугата. %s"
 
-#: ../src/config.py:150 ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Изключени"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Активен"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Събитие"
-
-#: ../src/config.py:402
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Стандартно съобщение"
 
-#: ../src/config.py:409
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:451
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:452
-msgid "Custom"
-msgstr "Персонални"
-
-#: ../src/config.py:645 ../src/dialogs.py:1199
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:646
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5792,255 +5990,214 @@ msgstr ""
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Първо получено съобщение"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Следващо получено съобщение в прозорец на фокус"
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Следващо получено съобщение в прозорец без фокус"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Включване на контакт"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Изключване на контакт"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Изпратено съобщение"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Осветено съобщение в стая"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Получено съобщение в стая"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "Получена поща от Gmail"
-
 #. Name column
-#: ../src/config.py:1313 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
-#: ../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 "Име"
 
-#: ../src/config.py:1399
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Свързване наново?"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1525 ../src/config.py:1624
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1660 ../src/config.py:1703
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1687
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: ../src/config.py:1699
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1700
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1704
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1715 ../src/config.py:1719
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1720
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1794
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Преименуване на акаунт"
 
-#: ../src/config.py:1795
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Въведете ново име за акаунт „%s“"
 
-#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864
-#: ../src/config.py:3079 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Невалиден Jabber ID"
-
-#: ../src/config.py:1822
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:2012 ../src/config.py:3151
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:2013 ../src/config.py:3152
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:2034
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:2035
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:2070
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/config.py:2071
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: ../src/config.py:2078
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:2079
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:2086 ../src/dialogs.py:1675 ../src/dialogs.py:1811
-#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:319
+#: ../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 "Не сте свързани към сървъра."
 
-#: ../src/config.py:2087
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:2091
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:2092
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:2123
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2124
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2307
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2309
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2345
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2347
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2348
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2397 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2439
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Отлъчване…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2441
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6048,11 +6205,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2443
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Добавяне на член…"
 
-#: ../src/config.py:2444
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6060,11 +6217,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2446
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик…"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6072,11 +6229,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор…"
 
-#: ../src/config.py:2450
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6084,14 +6241,15 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2451
+#: ../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 ""
 "Може да бъде едно от следните:\n"
 "1. потребител@домейн/ресурс (само този ресурс съвпада).\n"
@@ -6100,83 +6258,88 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2548
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2570 ../src/gajim.py:1429 ../src/roster_window.py:1933
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2571 ../src/roster_window.py:1907
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2572 ../src/roster_window.py:1934
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2581
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2678
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:2678
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:2679
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:2680
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:2781
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2782
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:3062
-msgid "Invalid username"
-msgstr "Невалидно потребителско име"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Невалиден псевдоним"
 
-#: ../src/config.py:3064
-msgid "You must provide a username to configure this account."
-msgstr "Трябва да въведете име на потребител за новия акаунт."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Псевдонимът не е позволен: %s"
 
-#: ../src/config.py:3090
-msgid "Duplicate Jabber ID"
-msgstr "Дублиран Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Невалиден сървър"
 
-#: ../src/config.py:3091
-msgid "This account is already configured in Gajim."
-msgstr "Този акаунт вече е конфигуриран в Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Невалиден формат"
 
-#: ../src/config.py:3108
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3109 ../src/config.py:3298
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6185,25 +6348,33 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3127
-msgid "Invalid server"
-msgstr "Невалиден сървър"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Новият акаунт беше създаден успешно"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3128
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Трябва да въведете име на потребител за новия акаунт."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Задайте сървър, където искате да се регистрирате."
 
-#: ../src/config.py:3179 ../src/gajim.py:2007
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: ../src/config.py:3180 ../src/gajim.py:2008
+#: ../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 ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: ../src/config.py:3248
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6218,7 +6389,7 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: ../src/config.py:3254 ../src/gajim.py:2031
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6229,23 +6400,63 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: ../src/config.py:3277 ../src/config.py:3316
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3297
-msgid "Your new account has been created successfully"
-msgstr "Новият акаунт беше създаден успешно"
-
-#: ../src/config.py:3400
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Активен"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Събитие"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Първо получено съобщение"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Следващо получено съобщение в прозорец на фокус"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Следващо получено съобщение в прозорец без фокус"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Включване на контакт"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Изключване на контакт"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Изпратено съобщение"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Осветено съобщение в стая"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Получено съобщение в стая"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Получена поща от Gmail"
+
+#: ../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"
@@ -6255,7 +6466,7 @@ msgstr ""
 "получено от отсрещния контакт. Ако иконата остане\n"
 "дълго време, най-вероятно съобщението е било изгубено."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6263,74 +6474,74 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:692
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Изход"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:704
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в адреса на речника и не е WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
-#: ../src/conversation_textview.py:1015 ../src/conversation_textview.py:1033
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
-
-#: ../src/conversation_textview.py:1290
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1294
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1328
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "В списъка вече има такъв Jabber ID"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Въведеният Jabber ID вече съществува в списъка. Изберете друг."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6345,142 +6556,142 @@ msgstr "Име на контакта: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Идентификатор на ключ"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Задаване на настроение"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Съобщение за състояние"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Презаписване на съобщението за състояние?"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Това име вече се използва. Искате ли да презапишете това съобщение за "
 "състояние?"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Запазване като настроено съобщение за състояние"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Напишете име за това съобщение за състояние"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Адрес на AIM:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Номер на GG:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Номер на ICQ:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Адрес на MSN:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Адрес на Yahoo!:"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Джабър клиент за GTK+"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "И не на последно място, бихме искали да благодарим на всички, които "
 "поддържат пакетите."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -6489,7 +6700,7 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6502,88 +6713,88 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Псевдонимът съдържа непозволени знаци."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2631
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1451
-#: ../src/groupchat_control.py:1732
-msgid "The nickname has not allowed characters."
-msgstr "Псевдонимът съдържа непозволени знаци."
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1899
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1900
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../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:"
@@ -6592,275 +6803,302 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../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 "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:474
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:476
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:478
-#: ../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 "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:478
-#: ../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 "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:479
-#: ../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 "Ново лично съобщение"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1594 ../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 "Нова е-поща"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1660 ../src/notify.py:481
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1560 ../src/gajim.py:1627
-#: ../src/notify.py:483 ../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 "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1702 ../src/gajim.py:1724
-#: ../src/gajim.py:1741 ../src/notify.py:485 ../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 "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1705 ../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 "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1450 ../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 "Покана за разговор в стая"
 
-#: ../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 "Контактът промени състоянието си"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "От %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:2559
+#. 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 "Бих искал(а) да ви добавя към списъка си."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Унил"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Група"
+
+#. 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 ""
+"Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
+"roster."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ред: %(order)s, действие: %(action)s, вид: %(type)s, стойност: %(value)s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
 #. # means number
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:3351
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "когато съм "
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6871,19 +7109,19 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Вече се проверили идентичността на този контакт."
 
-#: ../src/dialogs.py:3833 ../src/dialogs.py:3920
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Идентичността на контакта проверена"
 
-#: ../src/dialogs.py:3841
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Проверка наново…"
 
-#: ../src/dialogs.py:3846
+#: ../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 "
@@ -6893,19 +7131,19 @@ msgstr ""
 "съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
 "му като натиснете бутона по-долу."
 
-#: ../src/dialogs.py:3849 ../src/dialogs.py:3901 ../src/dialogs.py:3914
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Идентичността на контакта НЕ Е проверена"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Проверка…"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Проверихте ли идентичността на контакта?"
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6920,22 +7158,22 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
 
-#: ../src/dialogs.py:3902
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Ключът на контакта (%s) <b>не съвпада</b> с този, зададен в Gajim."
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/dialogs.py:3915
+#: ../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."
@@ -6944,7 +7182,7 @@ msgstr ""
 "така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
 "този ключ, използвайте клиент на GPG."
 
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -6952,33 +7190,33 @@ msgstr ""
 "Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
 "съобщенията ще бъдат шифрирани."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Други"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Стаи за разговор"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6986,267 +7224,295 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Изпълнение на команда"
 
-#: ../src/disco.py:1190 ../src/disco.py:1354
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Отметката вече е установена"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Стаята „%s“ вече присъства в отметките."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Отметката беше добавена успешно"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Може да организирате отметките чрез менюто „Действия“."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Записан"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Грешка в сертификата на SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Библиотека за проверка на валидността на сертификатите на сървърите. "
 "Използва се за установяване на сигурна връзка."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Изисква python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Разговори с автоматично открити контакти в локалната мрежа (без сървър)."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Изисква python-avahi."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Команди: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт за управление на Gajim от командния ред."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Изисква python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88
+#: ../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 ""
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифриране на съобщения с ключове на GPG."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Изисква gpg и python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Автоматично засичане на състоянието на мрежата."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Изисква gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Управление на сесии"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Запазва сесията на Gajim при излизане и я възстановява при влизане."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Изисква python-gnome2."
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Парола за влизане в стаята"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Паролите могат да се съхраняват по сигурен начин, вместо в обикновен текст."
 
-#: ../src/features_window.py:75
-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 "Изисква gnome-keyring и python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Възможност за свързване към сървъри, които използват записи SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Изисква dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Проверка на правописа"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Проверка на изходящите съобщения за правописни грешки."
 
-#: ../src/features_window.py:83
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Изисква python-gnome2-extras и компилация на модула „gtkspell“ от изходния "
-"код на Gajim."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Изисква python-sexy."
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Демон за уведомления"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Уведомления"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Изскачащи прозорци с уведомления за нови събития."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Изисква python-notify или python-dbus заедно с notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Икона в областта за уведомяване"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Икона в областта за уведомяване, отразяваща текущото състояние."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Изисква python-gnome2-extras или компилиран модул „trayicon“ от изходния код "
 "на Gajim."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Време на бездействие"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Съгласуване спрямо състоянието"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Възможност за измерване на времето на бездействие, с цел да се установи "
 "автоматично съобщение за състояние."
 
-#: ../src/features_window.py:95 ../src/features_window.py:96
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Изисква компилация на модула „idle“ от изходния код на Gajim."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
+msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:93
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Изисква python-gnome2."
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Трансформира изрази на LaTex, разграничени с $$ $$."
 
-#: ../src/features_window.py:99
+#: ../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."
@@ -7254,29 +7520,31 @@ msgstr ""
 "Изисква texlive-latex-base и dvipng. Трябва да активирате опцията "
 "„use_latex“ в редактора на настройки за напреднали."
 
-#: ../src/features_window.py:100
+#: ../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:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Шифриране тип „End to End“"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Шифриране на разговорите."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Изисква python-crypto."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Генератор на RST"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7284,25 +7552,25 @@ msgstr ""
 "Генериране на изход в XHTML от RST (вижте http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Изисква python-docutils."
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Възможност за натискане с мишката върху адреси в заглавните части на "
 "прозорците."
 
-#: ../src/features_window.py:111 ../src/features_window.py:112
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Изисква python-sexy."
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Функционалност"
 
@@ -7331,7 +7599,7 @@ msgstr "Размер: %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:496
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Вие"
 
@@ -7341,7 +7609,7 @@ msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Получател: "
 
@@ -7373,26 +7641,27 @@ msgid "Error message: %s"
 msgstr "Грешка: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Файловият трансфер е преустановен от отсрещната страна"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Файловият трансфер е преустановен"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане…"
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
@@ -7412,33 +7681,33 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../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 "Неуспех при презаписването на съществуващия файл „%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."
 msgstr "Вече съществува файл с това име и нямате права да го презапишете."
 
-#: ../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 "Този файл вече съществува"
 
-#: ../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 "Какво искате да направите?"
 
 #. 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 "Папката „%s“ не е разрешена за запис"
 
-#: ../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 "Нямата права да създавате файлове в тази папка."
 
@@ -7474,11 +7743,11 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Изпращач: "
 
@@ -7486,36 +7755,40 @@ msgstr "Изпращач: "
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:87
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s не е валидно ниво за дневник"
-
-#: ../src/gajim.py:160
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата…"
 
-#: ../src/gajim.py:190
-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 изисква PyGTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:191
-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 изисква PyGTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:193
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim изисква GTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:194
-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 изисква GTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7524,22 +7797,22 @@ msgstr ""
 "Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
 "стабилна от %s"
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
 "libglade."
 
-#: ../src/gajim.py:208
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim изисква PySQLite2"
 
-#: ../src/gajim.py:216
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim изисква pywin32"
 
-#: ../src/gajim.py:217
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7548,11 +7821,11 @@ msgstr ""
 "Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:370
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim вече е стартиран"
 
-#: ../src/gajim.py:371
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7560,25 +7833,35 @@ msgstr ""
 "Изглежда вече е стартирана друга инстанция на Gajim\n"
 "Продължаване въпреки това?"
 
-#: ../src/gajim.py:497
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Няма зададен ключ на GPG"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:513
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/gajim.py:514
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7589,50 +7872,59 @@ msgstr ""
 "участник.\n"
 "Укажете друг псевдоним по-долу:"
 
-#: ../src/gajim.py:575
+#: ../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 "Приемате ли това запитване?"
 
-#: ../src/gajim.py:577
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
 
-#: ../src/gajim.py:628 ../src/notify.py:493 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/gajim.py:934 ../src/gajim.py:938
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:948 ../src/gajim.py:962
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:994
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Искане за записване"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:1015
+#: ../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?"
@@ -7640,74 +7932,79 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: ../src/gajim.py:1056
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Отписване"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: ../src/gajim.py:1232 ../src/groupchat_control.py:1162
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: ../src/gajim.py:1250 ../src/groupchat_control.py:1337
-#: ../src/history_window.py:426 ../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 вече е %(status)s"
 
-#: ../src/gajim.py:1313
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(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:1377 ../src/groupchat_control.py:1122
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Стаята показва отсъстващ член"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: ../src/gajim.py:1385
+#: ../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:1388
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Воденето на дневник на стаята е изключено"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Стаята е напълно анонимна"
 
-#: ../src/gajim.py:1430
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
 
-#: ../src/gajim.py:1464
+#: ../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"
@@ -7715,27 +8012,56 @@ msgstr ""
 "Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
 "или е предоставил грешна парола.\n"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:1571
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG не е използваем"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
+"съобщения."
+
+#: ../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 "Да _не се задава този въпрос отново"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
+"променливата на обкръжението не е настроена)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Имате %d ново писмо"
 msgstr[1] "Имате %d нови писма"
 
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7750,34 +8076,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1657
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Премахване на контакт от списъка"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Грешка при четене на файл:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1746
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7786,46 +8122,46 @@ msgstr ""
 "Неуспех при дешифрирането на съобщение от %s\n"
 "Възможно е да е било фалшифицирано."
 
-#: ../src/gajim.py:1841
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Неуспех при дешифриране на съобщението"
 
-#: ../src/gajim.py:1912
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: ../src/gajim.py:1913
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s сек)"
 
-#: ../src/gajim.py:1949
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gajim.py:1974
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: ../src/gajim.py:1975
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
 
-#: ../src/gajim.py:2028
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: ../src/gajim.py:2029
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7836,19 +8172,19 @@ msgstr ""
 "(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/gajim.py:2050
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7860,11 +8196,11 @@ msgstr ""
 "\n"
 "Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
 
-#: ../src/gajim.py:2072 ../src/gajim.py:2102
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7872,16 +8208,11 @@ msgstr ""
 "На път сте да изпратите паролата си чрез нешифрирана връзка. Сигурни ли сте, "
 "че искате да го направите?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, наистина искам да се свържа по несигурен начин"
 
-#: ../src/gajim.py:2076 ../src/gajim.py:2106 ../src/groupchat_control.py:1841
-#: ../src/roster_window.py:3776
-msgid "Do _not ask me again"
-msgstr "Да _не се задава този въпрос отново"
-
-#: ../src/gajim.py:2103
+#: ../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?"
@@ -7890,27 +8221,27 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "Възелът на PEP не беше премахнат"
 
-#: ../src/gajim.py:2121
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2589 ../src/gajim.py:2610
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/gajim.py:2590
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: ../src/gajim.py:2611
+#: ../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 "
@@ -7920,55 +8251,38 @@ msgstr ""
 "формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
 "повече подробности."
 
-#: ../src/gajim.py:2637 ../src/roster_window.py:3310
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2917
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:3014
-msgid "Bookmark already set"
-msgstr "Отметката вече е установена"
-
-#: ../src/gajim.py:3015
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Стаята „%s“ вече присъства в отметките."
-
-#: ../src/gajim.py:3028
-msgid "Bookmark has been added successfully"
-msgstr "Отметката беше добавена успешно"
-
-#: ../src/gajim.py:3029
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Може да организирате отметките чрез менюто „Действия“."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Показва помощ за специфична команда"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "команда"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "показване на помощ за команда"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Показва или скрива списъка"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Показва следващото чакащо събитие в изскачащ прозорец"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7976,50 +8290,51 @@ msgstr ""
 "Показване на списък с всички контакти. Всеки контакт се появява на отделен "
 "ред"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "акаунт"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "показва само контактите на дадения акаунт"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Показване на списък с регистрираните акаунти"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Промяна на състоянието на акаунта или акаунтите"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "състояние"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
 "(невидим)"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "съобщение"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "съобщение за състояние"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8028,21 +8343,25 @@ msgstr ""
 "състоянието на всички акаунти, които имат настроена опция „синхронизиране с "
 "общото състояние“"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Показване на диалогов прозорец за разговор, за да може да се изпрати "
 "съобщение до контакта"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID на контакта, с който искате да разговаряте"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако е указано, контактът се взима от списъка с контакти на този акаунт"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8052,30 +8371,30 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID на контакта, който ще получи съобщението"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "ключ на OpenPGP"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "ако е указано, съобщението ще се шифрира, използвайки този публичен ключ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ако е указано, съобщението ще бъде изпратено от този акаунт"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8085,136 +8404,136 @@ msgstr ""
 "„OpenPGP key“ са по избор. Ако искате да настроите само „account“ без "
 "“OpenPGP key“, настройте „OpenPGP key“ на „“."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "тема на съобщението"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Изпраща ново съобщение до стаята, в която сте влезли."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID на стаята, която ще получи съобщението"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Получаване на подробна информация за контакта"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID на контакта"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Получаване на подробна информация за акаунта"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Име на акаунта"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Път до файл"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ако е указано, файлът бъде изпратен от този акаунт"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Показва всички настройки и техните стойности"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Настройва стойността на „ключ“ на „стойност“."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ключ=стойност"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "„ключ“ е името на настройката, „стойност“ е стойността, която се задава"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Изтрива обект от настройките"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "име на настройката за изтриване"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Запазва текущото състояние на настройките във файла .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Добавяне на контакт към списъка"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Добавяне на нов контакт към този акаунт"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Връща текущото състояние (общото, в случай, че не е указан акаунт)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Връща текущото съобщение за състояние (общото, в случай, че не е указан "
 "акаунт)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Връща броя непрочетени съобщения"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отваря прозореца „Започване на разговор“"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Започване на разговор, като се използва този акаунт"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Изпраща указан XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML за изпращане"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8222,67 +8541,72 @@ msgstr ""
 "Акаунт, до който да се изпраща XML; ако не е указан, ще се изпрати до всички "
 "акаунти"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработка на адрес тип xmpp://"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "адрес"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "Адрес за обработка"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Акаунт, за който искате да го обработите"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "текст на съобщението"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Влизане в стая"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "стая"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID на стая"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "псевдоним"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Псевдоним"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "парола"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Парола за влизане в стаята"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Проверка дали Gajim е стартиран"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Показва или скрива прозореца на IPython"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8291,16 +8615,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8309,16 +8633,16 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8327,7 +8651,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8336,7 +8660,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8345,7 +8669,7 @@ msgstr ""
 "Не е указан аргумент „%(arg)s“.\n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Грешен адрес"
 
@@ -8362,171 +8686,175 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Създайте нова тема с желаното име."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "име на тема"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Не може да изтриете текущата тема"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:149
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:151
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вече не сте в стая „%(room)s“ или „%(nick)s“ е напуснал(а)."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: ../src/groupchat_control.py:602
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: ../src/groupchat_control.py:604
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
-#: ../src/groupchat_control.py:1025
-msgid "Really send file?"
-msgstr "Наистина ли да се изпрати файла?"
-
-#: ../src/groupchat_control.py:1026
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Ако изпратите файл на %s, той/тя ще разбере истинския ви Jabber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1125
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1136
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s беше изритан от %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:1151
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:1198 ../src/groupchat_control.py:1202
-#: ../src/groupchat_control.py:1207
+#: ../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 беше изритан от стаята (%(reason)s)"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s от %(actor)s"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s от %(actor)s"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1731
-msgid "Invalid nickname"
-msgstr "Невалиден псевдоним"
-
-#: ../src/groupchat_control.py:1474 ../src/groupchat_control.py:1492
-#: ../src/groupchat_control.py:1576 ../src/groupchat_control.py:1593
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Тази стая няма тема"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 
-#: ../src/groupchat_control.py:1654
+#: ../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 "Псевдонимът не е намерен: %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 ""
 "Употреба: /%s <псевдоним|JID> [причина], отлъчва контакта от стаята. "
 "Псевдонимът може да се замества, но не и ако съдържа „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8535,7 +8863,7 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "участник."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8544,7 +8872,7 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8553,7 +8881,7 @@ msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8562,18 +8890,17 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_control.py:1681
-#, 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 ""
 "Употреба: /%s <псевдоним> [причина], премахва указания с псевдоним участник "
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_control.py:1690
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8582,22 +8909,22 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Употреба: /%s, показва имената на участниците в стаята."
 
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Употреба: /%s [тема], показва или актуализира текущата тема на стаята."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8605,39 +8932,53 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_control.py:1835
+#: ../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 "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1874
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1875
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1880
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1906
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: ../src/groupchat_control.py:1907
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8645,22 +8986,22 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2080
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:2081 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
@@ -8690,79 +9031,79 @@ msgstr "Подробности"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. 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 ""
 "Неуспех при запис на %s. Поддръжката за управление на сесиите няма да работи"
 
 #. 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 не е стандартния Джабър клиент"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Искате ли Gajim да бъде стандартния Джабър клиент?"
 
-#: ../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 ""
 "Винаги да се проверява дали Gajim е стандартния Джабър клиент при всяко "
 "стартиране"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: ../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 ""
 "Изображението не може да бъде запазено във формат %(type)s. Запазване като %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Запазване на изображението като…"
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8770,7 +9111,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА АКО GAJIM Е "
 "СТАРТИРАН)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8784,76 +9125,86 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте…"
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите…"
 
-#: ../src/history_manager.py:509
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:546
+#: ../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] "Наистина ли искате да изтриете дневниците на избрания контакт?"
 msgstr[1] "Наистина ли искате да изтриете дневниците на избраните контакти?"
 
-#: ../src/history_manager.py:550 ../src/history_manager.py:585
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:582
+#: ../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] "Наистина ли искате да изтриете избраното съобщение?"
 msgstr[1] "Наистина ли искате да изтриете избраните съобщения?"
 
-#: ../src/history_window.py:296
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "История на разговорите с %s"
 
-#: ../src/history_window.py:341
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr "Грешка при запис/четене от диска"
 
-#: ../src/history_window.py:422
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s вече е %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:432
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:435
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/htmltextview.py:590 ../src/htmltextview.py:601
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: ../src/htmltextview.py:611
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: ../src/message_window.py:445
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Не сте свързани към сървъра."
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Наистина ли искате да изтриете избраното съобщение?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:447
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/message_window.py:449
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/message_window.py:455
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Съобщения"
 
@@ -8865,66 +9216,67 @@ msgstr "— ще бъде воден дневник за съобщенията"
 msgid "- messages will not be logged"
 msgstr "— няма да бъде воден дневник за съобщенията"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ново лично съобщение от стая „%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 "Съобщение от %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr ""
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Игнориране"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Извличане на профила…"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2774
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2777
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2779 ../src/roster_window.py:2790
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
@@ -8932,77 +9284,69 @@ msgstr "Неуспех при зареждането на изображение
 msgid "Information received"
 msgstr "Получена информация"
 
-#: ../src/profile_window.py:320
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/profile_window.py:334
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Изпращане на профила…"
 
-#: ../src/profile_window.py:349
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Информацията НЕ Е публикувана"
 
-#: ../src/profile_window.py:356
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:286 ../src/roster_window.py:940
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1852
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1886
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1910
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
-"променливата на обкръжението не е настроена)"
-
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG не е използваем"
 
-#: ../src/roster_window.py:2109 ../src/roster_window.py:3253
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2110 ../src/roster_window.py:3254
+#: ../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?"
@@ -9010,15 +9354,28 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2136
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: ../src/roster_window.py:2274 ../src/roster_window.py:2511
+#: ../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 "Сигурни ли сте, че искате да напуснете стаята „%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 "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2275
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9026,16 +9383,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: ../src/roster_window.py:2512
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:2515
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:2516
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9043,11 +9400,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:2519
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:2524
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9057,51 +9414,56 @@ msgstr ""
 "тези транспорти: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:2656
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:2721
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:2722
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:2761
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:2762
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:3114
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:3118
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9110,11 +9472,11 @@ msgstr ""
 "ще ви вижда изключен."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3123
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: ../src/roster_window.py:3127
+#: ../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."
@@ -9122,16 +9484,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:3130
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3134
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:3138
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9140,20 +9502,20 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:3177
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:3178
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:3694
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:3696
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9161,14 +9523,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:3770
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3772
+#: ../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 "
@@ -9178,141 +9540,143 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:3885
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: ../src/roster_window.py:3896
+#: ../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] "Искате ли да изпратите този файл на %s:"
 msgstr[1] "Искате ли да изпратите тези файлове на %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Изпращане на %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Изпращане на файл до контакт"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4573 ../src/roster_window.py:4644
-#: ../src/roster_window.py:4653 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "от акаунт „%s“"
 
 #. add
-#: ../src/roster_window.py:4660
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:4665
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4702 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Управление на отметките…"
 
 #. profile, avatar
-#: ../src/roster_window.py:4722
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4762
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4824 ../src/roster_window.py:4933
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:4851
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:4858
-msgid "Mood"
-msgstr "Настроение"
-
-#: ../src/roster_window.py:4862
-msgid "Activity"
-msgstr "Дейност"
-
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Настройване на услуги…"
 
-#: ../src/roster_window.py:5021
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
 #. Send Group Message
-#: ../src/roster_window.py:5029 ../src/roster_window.py:5555
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: ../src/roster_window.py:5037
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: ../src/roster_window.py:5041
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
-#: ../src/roster_window.py:5452
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5575
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
 #. Send single message
-#: ../src/roster_window.py:5636
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5692
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
 #. Modify Transport
-#: ../src/roster_window.py:5700
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: ../src/roster_window.py:5781
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Изключване"
 
-#: ../src/roster_window.py:5861
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Нова стая"
 
 #. History manager
-#: ../src/roster_window.py:5974
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:5983
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:6193
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние…"
 
@@ -9329,20 +9693,20 @@ msgstr "Грешка в получените данни"
 msgid "No result"
 msgstr "Няма резултати"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Грешка при запис на диска"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Потвърждение на тези настройки на сесията"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9357,7 +9721,7 @@ msgstr ""
 "\n"
 "\tДопустими ли са тези настройки?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9372,124 +9736,116 @@ msgstr ""
 "\n"
 "Продължаване с тази сесия?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние…"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
-#: ../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 "Ресурс: "
 
-#: ../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 на тази стая"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [минимизиран]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Последно състояние: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " от %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Настроение:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Дейност:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Песен:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Временно прекъснат"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../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"
@@ -9505,16 +9861,21 @@ msgstr "Неизвестен"
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Неизвестен"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9522,7 +9883,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9530,13 +9891,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9544,14 +9905,100 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
+
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Натиснете, за да видите функционалностите (като MSN, ICQ транспорти) на "
+#~ "Джабър сървърите"
+
+#~ msgid "Servers Features"
+#~ msgstr "Функционалности на сървърите"
+
+#~ msgid "Your JID:"
+#~ msgstr "Вашия JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Име:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Хост:"
+
+#~ msgid "Show _roster"
+#~ msgstr "П_оказване на списъка"
+
+#, fuzzy
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Изберете акаунт, с който искате да синхронизирате"
+
+#~ msgid "Modify Account"
+#~ msgstr "Промяна на акаунт"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s на %(artist)s\n"
+#~ "от %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Акаунт „%s“"
+
+#~ msgid "Custom"
+#~ msgstr "Персонални"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Дублиран Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Този акаунт вече е конфигуриран в Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Изисква python-gnome2-extras и компилация на модула „gtkspell“ от "
+#~ "изходния код на Gajim."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Демон за уведомления"
+
+#~ msgid "Idle"
+#~ msgstr "Време на бездействие"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Изисква компилация на модула „idle“ от изходния код на Gajim."
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Файловият трансфер е преустановен от отсрещната страна"
+
+#~ msgid "Mood"
+#~ msgstr "Настроение"
+
+#~ msgid "Activity"
+#~ msgstr "Дейност"
diff --git a/po/br.po b/po/br.po
index b61c5a678..cce8569d0 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -45,7 +45,7 @@ msgid "_Add Contact..."
 msgstr "_Ouzhpennañ un darempred..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Dizoleiñ ar servijoù"
 
@@ -69,7 +69,7 @@ msgid "_Personal Events"
 msgstr "Titouroù hiniennel"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Kregiñ da flapiñ"
@@ -104,68 +104,66 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Implij an diskleriañ"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Kevreañ pa bouezan war Echuiñ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Bez em eus ur gont a fell din implij"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Kemmañ..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proksi:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Enrollañ ar _ger-kuzh"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#, fuzzy
-msgid "Servers Features"
-msgstr "Perzhioù ar servijerien"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Aozañ ma aelad pa lugan"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
@@ -178,31 +176,32 @@ msgstr ""
 "d'ar rouedad Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Ho JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Mont pelloc'h"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Echuiñ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Servijer:"
 
+#: ../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 "ID _Jabber:"
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Ger-kuzh:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porzh:"
 
@@ -210,11 +209,6 @@ msgstr "_Porzh:"
 msgid "_Server:"
 msgstr "_Servijer:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Anv:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -223,18 +217,16 @@ msgstr "<b>A bep seurt</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Titouroù hiniennel</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Kont"
 
@@ -243,25 +235,24 @@ msgid "Account Modification"
 msgstr "Kemmañ ar gont"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Roll ar verourien"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "C_heñch ar ger-kuzh"
 
@@ -278,37 +269,35 @@ msgstr ""
 "vous désactivez le TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Dibabit un _alc'hwezh..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klikit evit cheñch ger-kuzh ar gont"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Kevreadenn"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Kemmañ an titouroù hiniennel..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -316,17 +305,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Hollek"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Servijer:"
 
@@ -351,7 +337,6 @@ msgstr ""
 "pour prévenir des temps de latence pouvant entraîner des déconnexions"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -361,7 +346,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -371,7 +355,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -386,43 +369,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Hini ebet"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Titouroù hiniennel"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porzh:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -430,7 +415,7 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
@@ -439,12 +424,12 @@ msgid "Proxy:"
 msgstr "Proksi:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -454,30 +439,25 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "_Enrollañ ar ger-kuzh (diasur)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -488,21 +468,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Implij _SSL"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Implij ar proksioù evit treuzkas restroù"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 #, fuzzy
 msgid "_Name:"
 msgstr "_Anv:"
@@ -512,31 +487,38 @@ msgstr "_Anv:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Perzhioù</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Goulenn evit gwelet e/he stad"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoù"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Implij an diskleriañ"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_evreañ en ur loc'hañ Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Postel:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Enaouiñ"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 #, fuzzy
 msgid "First Name:"
 msgstr "Anv:"
@@ -548,7 +530,6 @@ msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -556,59 +537,97 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "ID Jabber:"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 #, fuzzy
 msgid "Last Name:"
 msgstr "Anv:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "_Strollañ ar c'hontoù"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Adenvel"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
+
+#: ../data/glade/accounts_window.glade.h:49
+msgid "Synchroni_ze account status with global status"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Implij un anv ostiz/porzh personelaet"
+
+#: ../data/glade/accounts_window.glade.h:53
 #, fuzzy
-msgid "Use custom port:"
+msgid "Use cust_om port:"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Kemmañ an titouroù hiniennel..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Enaouiñ"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Servijer:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Kemmañ..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porzh:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
 msgid "A_ccount:"
@@ -810,7 +829,7 @@ msgid "All statuses"
 msgstr "Stad:"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Ezvezant"
 
@@ -827,7 +846,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Diwelus"
 
@@ -837,7 +856,7 @@ msgid "Launch a command"
 msgstr "urzhiad"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Dihegerz"
 
@@ -956,7 +975,7 @@ msgstr "Anv:"
 msgid "New entry received"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../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 ""
 
@@ -1004,11 +1023,21 @@ msgstr "Roit ur ger-kuzh nevez:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Roit un titour-stad nevez</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Oberiant"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Webgaoz:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Kemennadennoù raklakaet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Enrollañ evel raklakaet..."
@@ -1071,11 +1100,11 @@ msgstr "_Ouzhpennañ er roll"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Istoradur"
 
@@ -1188,7 +1217,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "P'eo echu un treuzkas, diskouez ur gemennadenn gelaouiñ difoupus"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Kenderc'hel"
 
@@ -1225,7 +1254,7 @@ msgstr ""
 "Darempred\n"
 "Titl"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Tev"
 
@@ -1245,11 +1274,11 @@ msgstr "Personelaat gwiskadurioù Gajim"
 msgid "Gone"
 msgstr "Aet kuit"
 
-#: ../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 "Dizoberiant"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Stouet"
 
@@ -1301,7 +1330,7 @@ msgstr "Kemmañ ar _sujed"
 msgid "Configure _Room..."
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
@@ -1336,23 +1365,37 @@ msgstr "_Merour-ez"
 msgid "_Ban"
 msgstr "_Argas"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Ermaeziañ"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Ezel"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Kas ur gemennadenn brevez"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr ""
 
@@ -1360,13 +1403,13 @@ msgstr ""
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Digant"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Titl"
 
@@ -1382,7 +1425,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Merour istoradur Gajim"
 
-#: ../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 "Dilemel"
 
@@ -1407,7 +1451,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Klask en titourva"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Istoradur ar gaoz"
 
@@ -1428,7 +1472,7 @@ msgstr "Klask"
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
@@ -1456,8 +1500,8 @@ msgstr "Nevez 'zo:"
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "E_barzhiñ"
 
@@ -1486,7 +1530,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Servijer:"
 
@@ -1521,32 +1565,51 @@ msgstr "<b>Dibarzhioù</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "Kevreadenn HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Merañ an aeladoù proksi"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Anv:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Ger-kuzh:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Doare:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proksi:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Implij an diskleriañ"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Porzh:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Ostiz:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Implij ur proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Implij an diskleriañ"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL :"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Doare:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Anv:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1586,17 +1649,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Kas"
 
@@ -1702,10 +1770,14 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Aotren ar c'helaouennoù p'emaon _ezvezant/dihegerz/busy/diwelus"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Goulenn an titour-stad pa:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1719,20 +1791,20 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1741,34 +1813,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1779,7 +1851,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1789,7 +1861,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1797,25 +1869,25 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -1823,13 +1895,13 @@ msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1837,7 +1909,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1845,7 +1917,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1853,7 +1925,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1861,7 +1933,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1869,14 +1941,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1887,20 +1959,20 @@ msgstr ""
 "vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
 "messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1910,13 +1982,13 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1924,213 +1996,229 @@ msgstr ""
 "M'eo lazhet, ne vo ket erlec'hiet ar voulomelloù ascii doare ':)' gant "
 "boulomelloù grafikel fiñv pe difiñv"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Ur prenestr-flapiñ:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Kemmañ ar gont"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Diskouez er _roll hepken"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "_Gwiskadur:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Boulomelloù:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Kemennadenn o _vont 'maez:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Ket er roll"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "munutenn"
 
@@ -2183,7 +2271,7 @@ msgstr "ID Jabber:"
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
@@ -2255,127 +2343,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Personelaet</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamant:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Postel:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Chomlec'h 2:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familh:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personelaet</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Lec'hienn hiniennel:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Personelaet</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Lesanv:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Pellgomz:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Kod postel:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Perzhioù</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sonioù</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sonioù</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Diwar-benn"
 
@@ -2385,18 +2473,18 @@ msgstr ""
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Stumm : BBBB-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 #, fuzzy
 msgid "Personal Info"
 msgstr "Titouroù hiniennel"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Labour"
 
@@ -2414,8 +2502,8 @@ msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Dilemel"
 
@@ -2441,14 +2529,14 @@ msgstr "Kemmañ ar _strolladoù"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr ""
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr ""
 
@@ -2459,7 +2547,7 @@ msgstr "_Dilemel"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Goulenn evit gwelet e/he stad"
@@ -2487,12 +2575,6 @@ msgstr "Kregiñ da _flapiñ"
 msgid "_Allow him/her to see my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
@@ -2517,17 +2599,35 @@ msgstr "_Adenvel"
 msgid "_Subscription"
 msgstr "_Koumanant"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "_Kenderc'hel"
 
+#: ../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 "Dilemel"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2557,59 +2657,64 @@ msgstr "Aelad, Avatar"
 
 #: ../data/glade/roster_window.glade.h:9
 #, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Diskouez an darempredoù _ezlinenn"
+
+#: ../data/glade/roster_window.glade.h:10
+#, fuzzy
 msgid "Show Trans_ports"
 msgstr "Dorioù"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Kontoù"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Oberoù"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Endalc'hadoù"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Skoazell"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Penndibaboù"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Kuitaat"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Kas ur gemennadenn _simpl..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr ""
 
@@ -2628,12 +2733,12 @@ msgid "_Add contact"
 msgstr "Ouzhpennañ un _darempred"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Klask"
 
@@ -2723,10 +2828,6 @@ msgstr "Goulenn koumanantiñ"
 msgid "_Deny"
 msgstr "_Nac'hañ"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2753,10 +2854,6 @@ msgstr "Kas ur gemennadenn _simpl"
 msgid "Show All Pending _Events"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Diskouez ar _roll-darempredoù"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "S_tad"
@@ -2776,57 +2873,62 @@ msgstr "<b>Poelladoù</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Dibarzhioù</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Une erreur de protocole s'est produite :"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Taolennadur</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 #, fuzzy
 msgid "Comments"
 msgstr "Evezhiadenn: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Darempredoù"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Titouroù"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Muioc'h"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Choisissez un Avatar"
@@ -2839,6 +2941,11 @@ msgstr ""
 msgid "<b>XML Input</b>"
 msgstr ""
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Enaouiñ"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2867,13 +2974,13 @@ msgstr ""
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Kemmañ ar _strolladoù"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Adenvel"
 
@@ -2898,31 +3005,26 @@ msgstr ""
 msgid "Status:"
 msgstr "Stad:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-#, fuzzy
-msgid "Modify Account"
-msgstr "_Kemmañ ar gont..."
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Titouroù"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2950,7 +3052,7 @@ msgstr "Er strollad"
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr ""
 
@@ -2975,229 +3077,266 @@ msgstr "(Hini ebet)"
 msgid "Hidden"
 msgstr "Elfennoù kuzh"
 
+#: ../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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "German"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Greek"
 msgstr "Glas"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Croatian"
 msgstr "Chomlec'h"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Italian"
 msgstr "Stouet"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Polish"
 msgstr "_Embann"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Hollek"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "Islinennañ"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Lesanv"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Nodrezh:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Titouroù"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Ket er roll"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
@@ -3205,33 +3344,33 @@ msgstr "Implij an diskleriañ"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Urzhioù: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3240,66 +3379,66 @@ msgstr ""
 "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
 "personne. (ex : /%s explose.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, fuzzy, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "N'eus skoazell hegerz ebet evit /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "O paouez resev ur gemennadenn nevez digant \"%s\" emaoc'h"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3307,255 +3446,267 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "ur restr eo %s met rankout a rafe bezañ ur renkell"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "ur renkell eo %s met rankout a rafe bezañ ur restr"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "Titouroù"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "Darempred diluget"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "_Kenderc'hel"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "Taolennadur"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Flap a-stroll"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Er strollad"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - %d gemennadenn nevez"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Implij DBus ha Notification-Daemon evit diskouez ar c'hemennadennoù-kelaouiñ"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel ezvezant."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ezvezant rak dizoberiant"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "War-lerc'h pet munutenn e vo lakaet ho stad evel dihegerz."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Dihegerz rak dizoberiant."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:121
+#: ../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:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Implij ur re */_ evel arouezioù neuziañ an destenn."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "M'eo gwir, ne vo ket dilamet */_. Neuze e vo *abc* tev ma ne vez ket dilamet "
 "* *."
 
-#: ../src/common/config.py:128
+#: ../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:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:138
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Ouzhpennañ * hag [n] da ditl ar roll darempredoù?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3563,13 +3714,13 @@ msgstr ""
 "Niver a linennoù da vemoriñ diouzh ar gaozeadenn gent pa vez addigoret un "
 "ivinell pe ur prenestr."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "E-pad pet munutenn e rank linennoù diwezhañ ar gaozeadenn kent bezañ "
 "gwarezet."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3577,11 +3728,11 @@ msgstr ""
 "Kas ar gemennadenn gant Ctrl+Kas ha mont d'al linenn gant Kas (emzalc'h dre-"
 "ziouer ar poellad ICQ Mirabilis)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Niver a linennoù da zerc'hel soñj evit Ctrl+BirLaez"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3590,12 +3741,12 @@ msgstr ""
 "Pe un url personelaet gant %s ennañ, %s o vezañ ar ger-kuzh pe 'WIKTIONARY' "
 "hag a dalvez implij wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "M'eo diuzet, e vo tu da sturiañ Gajim a-bell en ur implij gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3603,28 +3754,28 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:182
+#: ../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:184
+#: ../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:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Goulenn a-raok serriñ un ivinell pe ur prenestr."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3633,7 +3784,7 @@ msgstr ""
 "Goulenn atav a-raok serriñ ar webgaozioù dispartiet gant un esaouenn ar roll-"
 "mañ."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3642,40 +3793,40 @@ msgstr ""
 "Chom hep goulenn morse a-raok serriñ ar webgaozioù dispartiet gant un "
 "esaouenn er roll-mañ."
 
-#: ../src/common/config.py:190
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Hervez ar standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Diskouez an ivinell pa 'z eus ur gaoz hepken?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Diskouez an nozelenn-serriñ war an ivinell?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3683,34 +3834,34 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_fications d'état de discussion"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 
-#: ../src/common/config.py:219
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 
-#: ../src/common/config.py:221
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3719,23 +3870,23 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr ""
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3744,35 +3895,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../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 "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3784,7 +3935,7 @@ msgstr ""
 "l'information sha dans les présences des salons"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3802,470 +3953,526 @@ msgstr ""
 "'peracct' - An holl gaozioù en ur prenestr hervez ar gont.\n"
 "'pertype' - Bep a brenestr gant ur stumm flapiñ (webgaoz/flap)."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "M'eo faos, ne weloc'h ket an avatar er prenestr-flapiñ ken"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "M'eo gwir, klikit war an douchenn Echap evit serriñ un ivinell/prenestr"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "A guzha roll ar berzhidi en ur prenestr webgaoz"
 
-#: ../src/common/config.py:250
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../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:256
+#: ../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:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../src/common/config.py:260
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../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:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 ""
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy
 msgid "Wrong host"
 msgstr "Ger-kuzh faos"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Gant berzh eo bet embannet ar vCard"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "échec lors de la publication de votre vCard"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "ID jabber direizh"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../src/common/connection_handlers.py:2580
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4276,274 +4483,284 @@ msgstr ""
 "jru.jabberstudio.org/ pour le supprimer"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "N'eo ket bet roet ar ger-kuzh OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Luget e voc'h da %s hep OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Respontet fall he deus an nor %s d'ar goulenn emezelañ."
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Kevreadenn"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Enrollet e-barzh: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Kevreadenn"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "N'eus ket tu da gas restroù goullo"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4552,19 +4769,30 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Darempredoù"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Sellerien"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Dorioù"
 
@@ -4575,11 +4803,11 @@ msgstr "Ket er roll"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
@@ -4611,1365 +4839,1324 @@ msgstr ""
 "Dihegerz eo bus an estez.\n"
 "Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "one"
 msgstr "Hini ebet"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "two"
 msgstr "piv"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "three"
 msgstr "Straed:"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "four"
 msgstr "Porzh:"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "five"
 msgstr "restr"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "seven"
 msgstr "Darvoud"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "nine"
 msgstr "_Kenderc'hel"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 #, fuzzy
 msgid "eleven"
 msgstr "Dilemel"
 
+#. 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"
+msgid "%(0)s o'clock"
 msgstr ""
 
-#. 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 ""
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:44
+#, fuzzy
+msgid "five past %(0)s"
+msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:44
 #, fuzzy
-msgid "ten past $0"
+msgid "ten past %(0)s"
 msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "quarter past %(0)s"
+msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "twenty past %(0)s"
+msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "twenty five past %(0)s"
+msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:46
 #, fuzzy
-msgid "twenty five to $1"
+msgid "twenty five to %(1)s"
 msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:46
 #, fuzzy
-msgid "twenty to $1"
+msgid "twenty to %(1)s"
 msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "quarter to $1"
+msgid "quarter to %(1)s"
 msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "ten to $1"
+msgid "ten to %(1)s"
 msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "five to $1"
+msgid "five to %(1)s"
 msgstr "Emezelañ war %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 #, fuzzy
 msgid "Morning"
 msgstr "O labourat"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 #, fuzzy
 msgid "Noon"
 msgstr "Hini ebet"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 #, fuzzy
 msgid "Evening"
 msgstr "Darvoud"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr ""
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s Go"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s Go"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s Mo"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s Mo"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s Ko"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s Ko"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s o"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Hegerz"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "a skriv ur gemennadenn..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "he/en deus serret ar prenestr-flapiñ pe an ivinell"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s Go"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s Go"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s Mo"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s Mo"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s Ko"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s Ko"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s o"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Kas ur gemennadenn"
 msgstr[1] "Kas ur gemennadenn"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/passwords.py:92
+#: ../src/common/passwords.py:123
 #, fuzzy, python-format
-msgid "Gajim account %s"
+msgid "XMPP account %s@%s"
 msgstr "eus ar gont %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Ehan"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Tev"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr ""
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Flapoù"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Tev"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Endalc'hadoù"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Echu"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Endalc'hadoù"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Dilemel"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Dizoberiant"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Strollad"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Ostiz:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "kemennadenn"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Diwelus"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "Hini ebet"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Ostiz:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Hollek"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Kemmañ"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Ezlinenn"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Strollad"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "Dilemel"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr ""
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Anv:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Lesanv"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "O kousket"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Straed:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Emezelañ"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Mare"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "Islinennañ"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Ger-kuzh faos"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Darvoud"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "O skrivañ"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Er strollad"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Darvoud"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Skarzhañ %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "E_barzhiñ"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cheñch ar sujed"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Skarzhañ %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Relaxing"
 msgstr "Standard"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Skarzhañ %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Dilugañ"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Abeg"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Abeg"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "O kousket"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "O tebriñ"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "O treuzkas"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "O skrivañ"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "O skrivañ"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "O labourat"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Evit kenderc'hel da gas ha da resev kemennadennoù, e rankit lugañ en-dro."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 #, fuzzy
 msgid "Could not start local service"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "N'eus ket tu da gas ho kemennadenn keit ha ma n'oc'h ket luget."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, fuzzy, python-format
 msgid "Error while adding service. %s"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Dizoberiant"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Oberiant"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Darvoud"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Titour-stad"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Personelaet</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Kemennadenn gentañ"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Kemennadenn da-heul"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Kemennadenn da-heul"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Darempred luget"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Darempred diluget"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Kemennadenn gaset"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Message d'un Salon mis en Sur-brillance"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Kemennadenn digant ur sal-flapiñ"
-
-#: ../src/config.py:1062
-#, fuzzy
-msgid "GMail Email Received"
-msgstr "Resevet ar bedadenn"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Anv"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Ret eo deoc'h adlugañ evit ma vo sevenet an holl gemmoù diouzhtu."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Rankout a rit bezañ diluget evit cheñch anv ar gont."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Rankout a rit lenn an holl zarvoudoù-mañ evit gellout cheñch anv ar gont."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5977,147 +6164,142 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Merañ ar c'hontoù"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "ID jabber direizh"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber a rank bezañ er stumm \"anv@anvservijer\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Bez ez eus bet ur gudenn en ur gargañ hoc'h alc'hwezhioù-kuzh OpenPGP."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Rankout a rit bezañ luget evit kemmañ ho titouroù hiniennel."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Rankout a rit krouiñ ho kont a-raok kemmañ an titouroù hiniennel."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6125,11 +6307,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6137,11 +6319,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6150,11 +6332,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6162,14 +6344,15 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "A c'hell bezañ unan eus ar stummoù da heul :\n"
 "1. lesanv@domani/resource(seulement cette ressource correspond).\n"
@@ -6179,89 +6362,96 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Gwiriekait ho peus leuniet an takadoù servijer ha sal-flapiñ pe lamit ar "
 "sined-mañ."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Eilañ an ID Jabber"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Road direizh"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6272,27 +6462,34 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Gant berzh eo bet krouet ho kont nevez!"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Rankout a rit reiñ un anv-arveriad-ez evit kefluniañ ar gont-mañ."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6302,7 +6499,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6310,31 +6507,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Gant berzh eo bet krouet ho kont nevez!"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Oberiant"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Darvoud"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Kemennadenn gentañ"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Kemennadenn da-heul"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Kemennadenn da-heul"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Darempred luget"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Darempred diluget"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Kemennadenn gaset"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Message d'un Salon mis en Sur-brillance"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Kemennadenn digant ur sal-flapiñ"
+
+#: ../src/config.py:3666
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Resevet ar bedadenn"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6343,76 +6583,76 @@ msgstr ""
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Kuitaat"
+
+#: ../src/conversation_textview.py:709
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Mankout a ra un \"%s\" e-barzh URL ar geriaoueg, ha n'eo ket WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Mankout a ra un \"%s\" e-barzh URL ar webklask"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Dec'h"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i devezh 'zo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Flaperez Jabber"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6427,42 +6667,42 @@ msgstr "Anv an darempred: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Strollad"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "Er strollad"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Anv an darempred"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Lakaat MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Titour-stad %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Titour-stad"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6470,111 +6710,111 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Enrollañ evel titour-stad rakenrollet"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Roit un anv d'an titour-stad-mañ"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Chomlec'h:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Chomlec'h 2:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Leuniit titouroù an darempred a zo da vezañ ouzhpennet er gont %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Leuniit an titouroù diwar-benn an darempred da ouzhpennañ"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Evit echuiñ, e fell deomp trugarekaat holl gempennerien ar pakad."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6583,95 +6823,95 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Goulenn enskrivañ evit ar gont %s digant %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../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 "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "N'hellit ket ebarzhiñ ur sal-flapiñ keit ha ma n'oc'h ket luget."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:1955
+#: ../src/dialogs.py:2180
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6681,284 +6921,310 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Fazi treuzkas"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:2568
+#. 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 "Me blijfe din ouzhpennañ ac'hanoc'h em roll-darempredoù."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Chomlec'h"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Kemmañ"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "ID Jabber:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Strollad"
+
+#. 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 "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Rankout a rit reiñ ur ger-kuzh evit enrollañ ar gont nevez."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Pedet oc'h bet gant %(contact_jid)s er sal-flapiñ %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6966,38 +7232,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7007,58 +7273,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Traoù all"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Rankout a rit bezañ luget evit gellout furchal er servijoù hegerz"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7066,318 +7332,343 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal e seurt servijoù."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "O furchal e-barzh %s oc'h implij ar gont %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "urzhiad"
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Sined lakaet dija"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Gant berzh eo bet ouzhpennet ar sined"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
+
+#: ../src/disco.py:1863
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Urzhioù: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP : "
+msgid "OpenGPG message encryption"
+msgstr "Encryption OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Merour an istoradur"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Kemennadenn gaset"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Kemmañ ar gont"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr ""
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Encryption OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "Kemennadenn o _tegouezhout:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Hollek"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Perzhioù ar servijerien"
@@ -7407,7 +7698,7 @@ msgstr "Ment: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "C'hwi"
 
@@ -7417,7 +7708,7 @@ msgid "Sender: %s"
 msgstr "Kaser: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Resever:"
 
@@ -7451,27 +7742,27 @@ msgstr "Fazi en ur lenn ar restr:"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Arsavet eo bet an treuzkas gant ho tarempred"
+msgid "File transfer stopped"
+msgstr "Sac'het an treuzkas"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Dibabit ur restr da gas..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Taolennadur: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "N'hell ket Gajim tizhout ar restr-mañ"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Implijet eo ar restr-mañ gant ur poellad all."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Restr: %s"
@@ -7491,33 +7782,33 @@ msgstr "Taolennadur: %s"
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr ""
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Petra a fell deoc'h ober?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -7553,55 +7844,55 @@ msgstr "Restr:"
 msgid "It is not possible to send empty files"
 msgstr "N'eus ket tu da gas restroù goullo"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Ehan"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Ezhomm en deus Gajim eus ur servijer X evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7610,21 +7901,21 @@ msgstr ""
 "Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
 "diwezhañ diwar %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7632,35 +7923,44 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Luget e voc'h da %s hep OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7671,148 +7971,184 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gajim.py:571
+#: ../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 "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s : %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Goulenn koumanantiñ"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Aotreet oc'h bet gant \"%s\" da welet e stad."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Koumanantiñ"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 a zo bremañ %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "_Chom hep goulenn ket"
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Bez ho peus %d postel nevez"
 msgstr[1] "Bez ho peus %d postel nevez"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7822,82 +8158,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "Fellout a ra da %s kas deoc'h ur restr."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Dilemel an darempred diouzh ar roll"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fazi en ur lenn ar restr:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Gant berzh ho peus resevet %(filename)s digant %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Arsavet eo an treuskas eus %(filename)s digant %(name)s."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Gant berzh ho peus kaset %(filename)s da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Arsavet eo an treuzkas eus %(filename)s da %(name)s."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7905,133 +8251,110 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Kevreadenn"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "_Chom hep goulenn ket"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "N'hellit ket ebarzhiñ ur webgaoz keit ha m'emaoc'h diwelus."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Sined lakaet dija"
-
-#: ../src/gajim.py:3001
-#, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Gant berzh eo bet ouzhpennet ar sined"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Bez e c'hellit merañ ho sinedoù dre ar meuziad Oberoù er roll-darempredoù."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "diskouez ar skoazell evit un urzhiad resis"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "urzhiad"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "diskouez ar skoazell evit an urzhiad"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "A zifoup ur prenestr gant ar gemennadenn dilenn da-heul"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8039,47 +8362,48 @@ msgid ""
 msgstr ""
 "A ziskouez ur roll eus an holl zarempredoù, pep darempred war ul linenn."
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "kont"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "diskouez darempredoù ar gont roet hepken"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "A ziskouez roll ar c'hontoù enrollet"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "A cheñch stad ar gont pe ar c'hontoù"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "stad"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "kemennadenn"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "titour stad"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8087,21 +8411,25 @@ msgstr ""
 "A cheñch stad ar gont \"kont\". Ma n'eus hini ebet roet, klaskit cheñch stad "
 "an holl gontoù o deus an dibab \"sync with global status\" enaouet"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "A ziskouez ar prenestr flapiñ evit ma c'hellfec'h kas ur gemennadenn d'un "
 "darempred"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID an darempred ho peus c'hoant flapiñ gantañ"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8112,29 +8440,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "alc'hwezh pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Ma vez resisaet, e vo kaset ar gemennadenn en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8145,216 +8473,221 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez renseigner seulement le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "subject"
 msgstr "Titl"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "message subject"
 msgstr "Kemennadenn gaset"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID an darempred hag a resevo ar gemennadenn"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Evit kargañ titouroù-munut un darempred"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID an darempred"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Evit kargañ titouroù-munut ur gont"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Anv ar gont"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Kas ur restr d'un darempred"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "restr"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Treug ar restr"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "m'eo resisaet, e vo kaset ar rest en ur implij ar gont-mañ"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Roll an holl zibaboù hag o zalvoudoù"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "A laka talvoud an 'alc'hwezh' da 'dalvoud'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "alc'hwezh=talvoud"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'alc'hwezh' eo anv an dibab, 'talvoud' eo an talvoud da lakaat dezhañ"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "A zilam un elfenn dibab"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "touchenn"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "anv an dibab da zilemel"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "A skriv stad red dibaboù Gajim er restr .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Ouzhennañ an darempred d'ar roll"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Ouzhpennañ un darempred nevez d'ar gont-mañ."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "A ro ar stad red (an hini hollek, nemet ez eus bet resisaet ur gont bennak)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "A gas an titour-stad red (an hini hollek, nemet ez eus bet resisaet ur gont "
 "bennak)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "A ro an niver a gemennadennoù chomet dilenn"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr ""
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "korf ar gemennadenn"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Ebarzhiñ ur webgaoz nevez"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "Digant"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Webgaoz:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "Lesanv"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "password"
 msgstr "Ger-kuzh:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8363,31 +8696,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8396,21 +8729,21 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Ger-kuzh faos"
@@ -8429,178 +8762,181 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "anv ar gwiskadur"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "N'hellit ket dilemel ar gwiskadur red"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "N'emaoc'h ket er webgaoz \"%s\" ken, pe neuze eo aet kuit \"%s\"."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a zo argaset gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s a zo bet skarzhet gant %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Anv-arveriad-ez direizh"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "N'eus sujed ebet gant ar webgaoz-mañ"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Darempred %(contact_jid)s bet pedet e-barzh %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "N'eus ket bet kavet al lesanv : %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 ""
 "Usage : /%s <surnom|JID> [raison], bannit le JID du salon. Le surnom de "
 "l'occupant peut être utilisé s'il ne contient pas de \"@\". Si le JID est "
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8609,7 +8945,7 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8618,7 +8954,7 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8627,7 +8963,7 @@ msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8636,18 +8972,17 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1683
+#: ../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 ""
 "Usage : /%s <surnom> [raison], supprime l'occupant portant le surnom "
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8656,83 +8991,97 @@ msgstr ""
 "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
 "envoie le message à l'occupant(e) spécifié(e) par le surnom."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage : /%s <message>, envoie un message sans chercher d'autres commandes."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Usage : /%s <surnom>, change votre surnom dans ce salon."
+
+#: ../src/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ha sur oc'h e fell deoc'h kuitaat ar flap \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ma serrit ar prenestr-mañ, e tigevreoc'h diouzh ar flap-mañ."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -8761,76 +9110,76 @@ msgstr "Munudoù"
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:396
+#: ../src/gtkgui_helpers.py:391
 #, fuzzy, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "N'eus ket bet tu skrivañ e-barzh %s."
 
 #. 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 ""
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Darempredoù"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Deiziad"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8838,7 +9187,7 @@ msgstr ""
 "Ha fellout a ra deoc'h naetaat an titourva? (DIALIET GROÑS M'EMAÑ GAJIM O "
 "VONT EN-DRO)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8847,177 +9196,187 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s e lâras %(who)s: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempred-mañ?"
 msgstr[1] "Ha sur oc'h e fell deoc'h diverkañ istoradur an darempredoù-mañ?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:585
+#: ../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] "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
 msgstr[1] "Ha fellout a ra deoc'h da vat diverkañ ar c'hemennadennoù diuzet?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Istoradur flapiñ gant %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s a zo bremañ %(status)s : %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "N'oc'h ket luget d'ar servijer"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Ha fellout a ra deoc'h da vat diverkañ ar gemennadenn ziuzet?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Kemennadennoù"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Kemennadenn hiniennel nevez digant ar sal %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Hollek"
+msgid "Ignore"
+msgstr "_Kenderc'hel"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 #, fuzzy
 msgid "Information received"
 msgstr "Resevet ar bedadenn"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Rankout a rit bezaén luget evit embann ho titouroù hiniennel."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "C'hwitet eo embannadur ar vCard"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9025,52 +9384,46 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ma asant \"%s\" ar c'houmanant e weloc'h he/e stad."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Adalek bremañ e welo ac'hanoc'h \"%s\" atav evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Kemer a rit perzh e unan pe meur a webgaoz"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9078,15 +9431,28 @@ msgstr ""
 "Tremen d'ar stad diwelus a lakao ac'hanoc'h da zilugañ diouzh ar webkaozioù-"
 "se. Ha sur oc'h e fell deoc'h bezañ diwelus?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Êtes-vous sûr de vouloir quitter les salons \"%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 "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9094,17 +9460,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9113,12 +9479,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9128,56 +9494,61 @@ msgstr ""
 "an nor-mañ."
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9186,12 +9557,12 @@ msgstr ""
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9199,17 +9570,17 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit dre-ziouer he/e aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Aotreañ an darempred-mañ da welout ma stad war-lerc'h e zilam"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9218,184 +9589,185 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Rankout a rit krouiñ ur gont a-raok gellout flapiñ gant tud all."
 
-#: ../src/roster_window.py:3786
+#: ../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 "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "Fellout a ra da %s kas deoc'h ur restr:"
 msgstr[1] "Fellout a ra da %s kas deoc'h ur restr:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Kas %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Strollañ %s ha %s"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "en ur implij ar gont %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Oberiant"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Flap a-stroll"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
@@ -9412,20 +9784,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Sujed: %s\n"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9435,7 +9807,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9445,130 +9817,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID Jabber:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:335
+#: ../src/tooltips.py:334
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Stad:"
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Kevreadenn"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Darempred diluget"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Koumanant:"
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Webgaoz:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Oberiant"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Doare:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Echu"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "N'eus ket bet kaset titouroù munut gant ar servij-mañ c'hoazh"
 
-#: ../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"
@@ -9584,24 +9946,29 @@ msgstr "Dianav"
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Dianav"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Dedennet eo an darempred-mañ gant ho pezañs, met n'oc'h ket gant he/e hini"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9609,32 +9976,80 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Dedennet hoc'h an eil gant bezañs egile/eben"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "N'oc'h ket dedennet gant bezañs an darempred-mañ, nag eñ/hi gant ho hini"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Emaoc'h o c'hortoz respont an darempred d'ho koulenn koumanantiñ"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr ""
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Encryption OpenPGP"
+#, fuzzy
+#~ msgid "Servers Features"
+#~ msgstr "Perzhioù ar servijerien"
+
+#~ msgid "Your JID:"
+#~ msgstr "Ho JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Anv:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Ostiz:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Diskouez ar _roll-darempredoù"
+
+#, fuzzy
+#~ msgid "Modify Account"
+#~ msgstr "_Kemmañ ar gont..."
+
+#, fuzzy
+#~ msgid "Gajim account %s"
+#~ msgstr "eus ar gont %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Personelaet</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Eilañ an ID Jabber"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Kefluniet eo bet ar gont-mañ e-barzh Gajim dija."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP : "
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Arsavet eo bet an treuzkas gant ho tarempred"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Hollek"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Oberiant"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr ""
@@ -9662,9 +10077,6 @@ msgstr ""
 #~ msgid "_Retype Password:"
 #~ msgstr "_Adroit ho ker-kuzh"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Implij ur proxy"
-
 #~ msgid ""
 #~ "If you have 2 or more accounts and it is checked, Gajim will list all "
 #~ "contacts as if you had one account"
@@ -9802,9 +10214,6 @@ msgstr ""
 #~ msgid "_Before time:"
 #~ msgstr "_A-raok an eur:"
 
-#~ msgid "_Font:"
-#~ msgstr "_Nodrezh:"
-
 #~ msgid "_Never"
 #~ msgstr "_Morse"
 
@@ -9817,9 +10226,6 @@ msgstr ""
 #~ msgid "_Pop it up"
 #~ msgstr "Di_foupañ"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL :"
-
 #~ msgid "Address"
 #~ msgstr "Chomlec'h"
 
@@ -9939,9 +10345,6 @@ msgstr ""
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Kas %s er strollad %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Strollañ %s ha %s"
-
 #, fuzzy
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "A guzha an nozelennoù er prenestroù-flapiñ"
@@ -9976,9 +10379,6 @@ msgstr ""
 #~ msgstr[0] "Gajim - %d gemennadenn brevez nevez"
 #~ msgstr[1] "Gajim - kemennadennoù prevez nevez: %d"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #, fuzzy
 #~ msgid "Connection to host could not be established"
 #~ msgstr "N'eus ket tu seveniñ al lugadenn gant an darempred."
@@ -9991,10 +10391,6 @@ msgstr ""
 #~ msgstr "Perzh:"
 
 #, fuzzy
-#~ msgid "Add"
-#~ msgstr "Chomlec'h"
-
-#, fuzzy
 #~ msgid "Away "
 #~ msgstr "Ezvezant"
 
@@ -10019,9 +10415,6 @@ msgstr ""
 #~ msgid "Invalid room or server name"
 #~ msgstr "Anv sal pe servijer direizh"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "Gant berzh eo bet embannet ar vCard"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Gant berzh eo bet embannet ho titouroù hiniennel."
 
@@ -10085,10 +10478,6 @@ msgstr ""
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s vous a envoyé un nouveau message."
 
-#, fuzzy
-#~ msgid "GUI Migration failed"
-#~ msgstr "échec lors de la publication de votre vCard"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "L'historique a été corectement récupéré."
 
@@ -10147,9 +10536,6 @@ msgstr ""
 #~ msgid "account: "
 #~ msgstr "compte : "
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "Si vous fermer cette fenêtre, vous serez déconnecté de ces salons."
 
diff --git a/po/cs.po b/po/cs.po
index 276a734e6..d50798e5d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -17,19 +17,14 @@
 # scippio <scippio@berounet.cz>, 2008.
 # Pihhan <pihhan@seznam.cz>, 2009.
 #
-#. app_name (string)
-#. replaces_id (uint)
-#. event_id (string)
-#. app_icon (string)
-#: ../src/notify.py:563
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-01 19:06+0200\n"
-"PO-Revision-Date: 2009-02-15 00:22+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:44+0200\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
-"Language-Team: \n"
+"Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -125,87 +120,92 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Použít při_hlášení k proxy"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Připojit když stisknu Dokončit"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Už mám účet který bych rád(a) použil(a)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../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 "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Spravovat..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Uložit _heslo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Nastavit profil, když se připojuji"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Použít vlastní jméno počítače/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../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."
 msgstr "Potřebujete mít účet pro připojení k síti Jabber."
 
-#: ../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 "_Rozšířené"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Počítač: "
 
-#: ../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:57
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../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 "_Heslo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -240,17 +240,17 @@ msgid "Administration operations"
 msgstr "Seznam správců"
 
 #: ../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 "Automaticky se znovu připojit při ztrátě spojení"
 
 #: ../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 "_Připojit po startu Gajimu"
 
 #: ../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 "_Změnit heslo"
 
@@ -266,22 +266,22 @@ msgstr ""
 "server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
 
 #: ../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 "Vyberte _klíč..."
 
 #: ../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 "Klikněte pro změnu hesla k účtu"
 
 #: ../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 "Klikněte k vyžádání autorizace od všech kontaktů jiného účtu"
 
 #: ../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 "Spojení"
 
@@ -291,10 +291,10 @@ msgstr "Upravit osobní informace..."
 
 #. 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:1192
-#: ../src/common/helpers.py:1204 ../src/notify.py:559 ../src/notify.py:580
-#: ../src/notify.py:619 ../src/notify.py:631
+#: ../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"
 
@@ -302,10 +302,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:2684
-#: ../src/roster_window.py:5227
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Obecné"
 
@@ -314,7 +314,7 @@ msgid "Hostname: "
 msgstr "Počítač: "
 
 #: ../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."
@@ -323,7 +323,7 @@ msgstr ""
 "takže přenos souboru má větší šanci správného fungování."
 
 #: ../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"
@@ -340,7 +340,7 @@ msgstr ""
 "pro Vás"
 
 #: ../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"
@@ -348,7 +348,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
 
 #: ../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 "
@@ -358,13 +358,13 @@ msgstr ""
 "spodní straně Seznamu) změní stav tohoto účtu také"
 
 #: ../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 "Informace o Vás, jak jsou uloženy na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1575
-#: ../src/config.py:2078
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
@@ -374,19 +374,19 @@ msgstr "Není zvolen žádný klíč"
 #. 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:1123
-#: ../src/config.py:1212 ../src/config.py:1480 ../src/config.py:1485
-#: ../src/config.py:1986 ../src/config.py:2064 ../src/config.py:2077
-#: ../src/config.py:3166 ../src/config.py:3234 ../src/dialogs.py:293
+#: ../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:2754 ../src/roster_window.py:2760
-#: ../src/roster_window.py:2765
+#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
+#: ../src/roster_window.py:2800
 msgid "None"
 msgstr "Žádný"
 
 #: ../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 "Osobní údaje"
@@ -396,12 +396,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_ta:"
 
 #: ../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 "
@@ -412,7 +412,7 @@ msgstr ""
 "klient s vyšší prioritou"
 
 #: ../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 "Priorita se automaticky změní podle vašeho stavu."
 
@@ -421,12 +421,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../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 "Zd_roj: "
 
 #: ../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 "
@@ -445,7 +445,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Uložit _heslo (nebezpečné)"
 
 #: ../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 "Uložit _historii pro všechny kontakty"
 
@@ -454,13 +454,12 @@ msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
 #: ../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 "Synch_ronizovat stav účtu s globálním stavem"
 
 #: ../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 "Synchronizovat kontakty"
@@ -470,7 +469,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Použít _SSL (staré)"
 
 #: ../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 "Použij proxy při přenosu souborů"
 
@@ -479,7 +478,7 @@ msgid "_Adjust to status"
 msgstr "N_astavit podle stavu"
 
 #: ../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 "_Jméno: "
 
@@ -495,7 +494,12 @@ msgstr "_Nastavit podle stavu"
 msgid "Accounts"
 msgstr "Účty"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Použít při_hlášení k proxy"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -503,25 +507,25 @@ msgstr ""
 "Zaškrtněte pokud se má Gajim ptát předtím než odešlete vaše heslo přes "
 "nezabezpečené připojení."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: ../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-Mail:"
 
-#: ../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 "Křestní:"
 
-#: ../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 "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../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"
@@ -531,84 +535,85 @@ msgstr ""
 "můžeš si zvolit jiný.\n"
 "Můžeš také zvážit změnu nastavení firewallu."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:780
+#: ../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 "Příjmení:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Spojit účty"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5178
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Send _keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Synchroni_ze account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 msgid "Use G_PG Agent"
 msgstr "Použít GPG _Agenta"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use cust_om hostname/port"
 msgstr "Použít vlastní _jméno počítače/port"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use cust_om port:"
 msgstr "Použít _vlastní port:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 msgid "_Edit Personal Information..."
 msgstr "_Upravit osobní informace..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Hostname: "
 msgstr "_Počítač: "
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Manage..."
 msgstr "_Spravovat..."
 
-#: ../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 "_Varovat před použitím nezabezpečeného spojení"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_použít proměnnou prostředí HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -796,7 +801,7 @@ msgid "All statuses"
 msgstr "Všechny stavy"
 
 #: ../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 "Pryč"
 
@@ -813,7 +818,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Neviditelný"
 
@@ -822,7 +827,7 @@ msgid "Launch a command"
 msgstr "Provést příkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Nedostupný"
 
@@ -942,7 +947,7 @@ msgstr "Naposledy upraveno:"
 msgid "New entry received"
 msgstr "Přijat nový záznam"
 
-#: ../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 "Dostal(a) jste novou položku: "
 
@@ -1059,11 +1064,11 @@ msgstr "Přid_at do Seznamu"
 
 #: ../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:5874
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historie"
 
@@ -1171,7 +1176,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Zobraz upozornění, až bude přenos souboru dokončen"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -1208,7 +1213,7 @@ msgstr ""
 "Řádek kontaktu\n"
 "Nadpis rozhovoru"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:761
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Tučné"
 
@@ -1232,7 +1237,7 @@ msgstr "Pryč"
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:762
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Latinka"
 
@@ -1281,7 +1286,7 @@ msgstr "Změnit _předmět"
 msgid "Configure _Room..."
 msgstr "Nastavit _místnost"
 
-#: ../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 "_Záložky"
 
@@ -1313,23 +1318,37 @@ msgstr "_Správce"
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../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 "_Blokovat"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "Č_len"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../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 "_Odblokovat"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Hlas"
 
@@ -1337,13 +1356,13 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoř nový zápis"
 
-#: ../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 "Odesílatel"
 
 #. 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 "Předmět"
 
@@ -1361,7 +1380,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vítejte do Gajimova Správce Historie</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 "Smazat"
 
@@ -1414,7 +1434,7 @@ msgstr "Najít:"
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1803
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
@@ -1441,8 +1461,8 @@ msgstr "Nedávno:"
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../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 "_Vstoupit"
 
@@ -1470,7 +1490,7 @@ msgstr "Minimalizovat po připojení"
 msgid "Print status:"
 msgstr "Vypiš stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1499,10 +1519,6 @@ msgid "<b>Settings</b>"
 msgstr "<b>Nastavení</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"
@@ -1512,39 +1528,39 @@ 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 "Spravovat profily Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Proxy _Host:"
 msgstr "P_očítač Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Port:"
 msgstr "_Port Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr "Použij 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 "Použít při_hlášení k proxy"
 
-#: ../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:16
+#: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Uživatel:"
 
@@ -1595,7 +1611,7 @@ msgstr "Zobrazit profil kontaktu (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 "Ode_slat"
 
@@ -2194,7 +2210,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2688
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
@@ -2338,7 +2354,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Před jménem</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:323
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Postavení:</b>"
 
@@ -2398,8 +2414,8 @@ msgstr "Odstranit účet z Gajimu i ze _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5215
-#: ../src/roster_window.py:5693 ../src/roster_window.py:5822
+#: ../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 "Odst_ranit"
 
@@ -2421,14 +2437,14 @@ msgstr "Upravit _skupiny"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5133 ../src/roster_window.py:5646
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
@@ -2438,7 +2454,7 @@ msgstr "Odst_ranit"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5731
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
 
@@ -2463,12 +2479,6 @@ msgstr "Začít _rozhovor"
 msgid "_Allow him/her to see my status"
 msgstr "_Dovol kontaktu vidět můj stav"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5206 ../src/roster_window.py:5683
-#: ../src/roster_window.py:5812
-msgid "_Block"
-msgstr "_Blokovat"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zakaž mu/jí vidět můj stav"
@@ -2490,16 +2500,34 @@ msgstr "_Přejmenovat"
 msgid "_Subscription"
 msgstr "_Autorizace"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5200 ../src/roster_window.py:5677
-#: ../src/roster_window.py:5809
-msgid "_Unblock"
-msgstr "_Odblokovat"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Neignorovat"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Přid_at Kontakt..."
@@ -2537,7 +2565,8 @@ msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2554,7 +2583,7 @@ msgstr "_Akce"
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../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 "_Úpravy"
 
@@ -2595,11 +2624,11 @@ msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5834
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: ../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 "_Najít"
 
@@ -2685,11 +2714,6 @@ msgstr "Žádost o autorizaci"
 msgid "_Deny"
 msgstr "O_dmítnout"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-#, fuzzy
-msgid "Select the account with which to synchronise"
-msgstr "Vybrat účet pro synchronizaci"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Vybrat účet pro synchronizaci"
@@ -2714,10 +2738,6 @@ msgstr "Odeslat jednoduchou _zprávu"
 msgid "Show All Pending _Events"
 msgstr "Zobrazit všechny čekající _události"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Zobrazit _Seznam"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "S_tav"
@@ -2826,13 +2846,13 @@ msgstr "Přiřadit Open_PGP klíč"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5666
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5792
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
@@ -2856,25 +2876,25 @@ msgstr "Zdroj:"
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Zrušit ověření"
 
-#: ../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 "Právě se provadí příkaz. Chcete ho skutečně přerušit?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Služba změnila identifikátor sezení."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Služba odeslala chybné data"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Služba změnila identifikátor sezení."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
@@ -2899,7 +2919,7 @@ msgstr "Číslo"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:781
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Barva"
 
@@ -2924,6 +2944,11 @@ msgstr "(Žádný)"
 msgid "Hidden"
 msgstr "Skryté"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Dostal(a) jste novou položku: "
+
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
@@ -3029,84 +3054,84 @@ msgstr "Švédština"
 msgid "Chinese (Ch)"
 msgstr "Čínština"
 
-#: ../src/chat_control.py:359
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
 
 #. we are not connected
-#: ../src/chat_control.py:382 ../src/chat_control.py:568
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:383 ../src/chat_control.py:569
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: ../src/chat_control.py:763
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Podtrhnout"
 
-#: ../src/chat_control.py:764
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Přeškrtnout"
 
-#: ../src/chat_control.py:787
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:796
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Smazat formátování"
 
-#: ../src/chat_control.py:868
+#: ../src/chat_control.py:877
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/chat_control.py:869
+#: ../src/chat_control.py:878
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Pokud odešlete soubor %s, tak bude znát vaše skutečné Jabber ID."
 
-#: ../src/chat_control.py:1255 ../src/chat_control.py:1644
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1285 ../src/chat_control.py:2146
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:862
-#: ../src/dialogs.py:1005 ../src/dialogs.py:1729 ../src/dialogs.py:1754
-#: ../src/gajim.py:988 ../src/gajim.py:1721 ../src/normal_control.py:483
-#: ../src/roster_window.py:910 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1890
-#: ../src/roster_window.py:3121 ../src/roster_window.py:3147
-#: ../src/roster_window.py:5327 ../src/roster_window.py:5512
+#: ../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 "Není v Rosteru"
 
-#: ../src/chat_control.py:1298
+#: ../src/chat_control.py:1310
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Seznam aktivních, dokončených a zastavených přenosů souborů"
 
-#: ../src/chat_control.py:1301
+#: ../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:1408 ../src/tooltips.py:626
+#: ../src/chat_control.py:1420 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: ../src/chat_control.py:1410 ../src/tooltips.py:631
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: ../src/chat_control.py:1412 ../src/tooltips.py:636
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: ../src/chat_control.py:1415 ../src/tooltips.py:638
+#: ../src/chat_control.py:1427 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3115,17 +3140,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1539
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z diskuze %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1624 ../src/dialogs.py:4030
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/chat_control.py:1625
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3133,50 +3158,50 @@ msgstr ""
 "Tento kontakt nemá přiřazen GPG klíč. Proto nemůžeš šifrovat pomocí GPG "
 "zprávy."
 
-#: ../src/chat_control.py:1634
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:1660
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sezení BUDE logováno"
 
-#: ../src/chat_control.py:1662
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
 #. encryption %s active
-#: ../src/chat_control.py:1676
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1676
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NENÍ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1678
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1678
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NEBUDE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1682
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1686
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "a NEautentizovaný"
 
 #. 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:1692
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3186,26 +3211,26 @@ msgstr ""
 "Váš rozhovor %(logged)s zaznamenáván."
 
 # FIXME: co je zeroconf?
-#: ../src/chat_control.py:1740
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Příkaz není podporován pro zeroconf účet."
 
-#: ../src/chat_control.py:1751 ../src/groupchat_control.py:1661
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/chat_control.py:1754 ../src/groupchat_control.py:1675
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/chat_control.py:1757 ../src/groupchat_control.py:1680
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Použití: /%s, skryje tlačítka rozhovoru."
 
-#: ../src/chat_control.py:1760 ../src/groupchat_control.py:1696
+#: ../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 "
@@ -3214,77 +3239,77 @@ msgstr ""
 "Použití: /%(command)s <akce>, pošle akci do aktuální místnosti. Použijte "
 "třetí osobu (například /%(command)s explodoval.)"
 
-#: ../src/chat_control.py:1765
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Použití: /%s, pošle ping kontaktu"
 
-#: ../src/chat_control.py:1768
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Použití: /%s, pošle zprávu kontaktu"
 
-#: ../src/chat_control.py:1771 ../src/groupchat_control.py:1719
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
-#: ../src/chat_control.py:1904
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: ../src/chat_control.py:1911
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: ../src/chat_control.py:1914
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "Kontakt nebyl ověřen. Klikněte na tlačítko štítu pro více informací."
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:1957 ../src/chat_control.py:1970
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#: ../src/chat_control.py:1963
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Následující zpráva byla šifrovaná"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2344
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Právě jsi obdržela novou zprávu od \"%s\""
 
-#: ../src/chat_control.py:2345
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "Pokud zavřete toto okno a historie je vypnutá, tato zpráva bude ztracena."
 
-#: ../src/chat_control.py:2493 ../src/common/connection_handlers.py:1965
-#: ../src/common/connection_handlers.py:2011
-#: ../src/common/connection_handlers.py:2199
-#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1357
-#: ../src/gajim.py:158
+#: ../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 "Chyba Databáze"
 
-#: ../src/chat_control.py:2494
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3293,7 +3318,7 @@ msgstr ""
 "Nelze přečíst soubor databáze (%s). Opravte ho nebo smažte (tím ztratíte "
 "všechny zprávy v historii)."
 
-#: ../src/chat_control.py:2724
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
@@ -3302,23 +3327,23 @@ msgstr "%(name)s je nyní %(status)s"
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../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 je soubor, ale měl by být adresář"
 
-#: ../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 se nyní ukončí"
 
-#: ../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 je adresář, ale měl by to být soubor"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
@@ -3382,9 +3407,9 @@ msgstr "Vyber diskuze, které chceš opustit"
 
 #. 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:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5103
+#: ../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 "Diskuze"
 
@@ -3400,72 +3425,72 @@ msgstr "Přeposlat nepřečtené zprávy"
 msgid "All unread messages have been forwarded."
 msgstr "Všechny nepřečtené zprávy byly přeposlány."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Používej DBus a Notifikačního démona k zobrazování notifikací"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Zobraz v rosteru pouze online kontakty nebo kontakty hledající pokec."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na pryč."
 
-#: ../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 (Pryč z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:89
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Čas v minutách, po kterém se Váš stav přepne na nedostupný."
 
-#: ../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 (Nedostupný z důvodu nečinosti po více než $T minut)"
 
 # FIXME: asi blbe
-#: ../src/common/config.py:92
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S bude změněn na aktuální stav, čas: $T"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:89
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kdy zobrazit ikonu v oznamovací oblasti. Může být jedno z nikdy='never', při "
 "události='on_event', vždy='always'."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Seznam (oddělené mezerami) řádků (účtů a skupin), které budou \"zhroucené\"."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:473
-#: ../src/common/optparser.py:225 ../src/common/optparser.py:443
-#: ../src/common/optparser.py:477 ../src/gajim.py:3277
+#: ../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 "výchozí"
 
-#: ../src/common/config.py:110
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Povolit lokální zprávy typu zeroconf"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Jazyk použitý kontrolou pravopisu"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3475,7 +3500,7 @@ msgstr ""
 "'někdy' - vypiš čas každou print_ichat_every_foo_minutes minutu.\n"
 "'nikdy' - nevypisuj čas."
 
-#: ../src/common/config.py:115
+#: ../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. "
@@ -3485,17 +3510,17 @@ msgstr ""
 "to 4, nebo 0 pro vypnutí Fuzzy Clock. 1 je nejpřesnější čas, 4 nejméně "
 "přesný. Toto se použije jenom při print_time nastaveném na 'někdy'."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Ber * / _ páry jako možné formátovací znaky."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Pokud zapnuto, nemažte */_ . Potom *abc* bude tučně ale s * * neodstraněnými."
 
-#: ../src/common/config.py:122
+#: ../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/"
@@ -3506,7 +3531,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Pokud si to chcete prohlédnout, "
 "nainstalujte docutils)"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3514,7 +3539,7 @@ msgstr ""
 "Znak, který se přidá za přezdívku po použití doplňování jména tabulátorem v "
 "diskuzi."
 
-#: ../src/common/config.py:132
+#: ../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."
@@ -3522,7 +3547,7 @@ msgstr ""
 "Znak navržený pro přidání za zamýšlenou přezdívku, pokud už ji používá někdo "
 "jiný v diskuzi."
 
-#: ../src/common/config.py:160
+#: ../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 "
@@ -3533,19 +3558,19 @@ msgstr ""
 "informací shlédněte dokumentaci pythonu funkce strftime na: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky, které budou vypisovány před přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky, které budou vypisovány za přezdívkou v rozhovorech"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3553,11 +3578,11 @@ msgstr ""
 "Jak moc řádků si pamatovat z předchozího rozhovoru, když je okno/záložka "
 "rozhovoru znovu otevřena."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kolik minut by měly řádky z předchozího rozhovoru zůstat."
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3565,11 +3590,11 @@ msgstr ""
 "Odeslat zprávu při Ctrl+Enter a při Enter přejít na nový řádek (výchozí "
 "chování klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3578,11 +3603,11 @@ msgstr ""
 "Buď vlastní url s %s v těle, kde %s je slovo nebo fráze, nebo 'WIKTIONARY', "
 "která znamená že se použije wiktionary."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Pokud zaškrtnuta, Gajim může být ovládán vzdáleně pomocí gajim-remote."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3594,14 +3619,14 @@ msgstr ""
 "synchronizují se s globálním stavem) v závislosti na stavu síťového "
 "připojení."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Odešílat události stavu rozhovoru. Může být pouze jediná, composing_only, "
 "vypnutá."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3609,7 +3634,7 @@ msgstr ""
 "Zobraz stavy rozhovoru v okně rozhovoru. Může být jedno z all, "
 "composing_only nebo disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3617,11 +3642,11 @@ msgstr ""
 "Když nevypisuji čas pro každou zprávu (print_time=='někdy'), vypisuj ji "
 "každých x minut."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ptát se před zavřením oken/záložek diskuzí."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3629,7 +3654,7 @@ msgstr ""
 "Vždy se ptát před zavřením oken/panelů diskuzí uvedených v tomto seznamu "
 "mezerami oddělením Jabber ID místností."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3637,13 +3662,13 @@ msgstr ""
 "Nikdy se neptát před zavřením oken/záložek diskuzí uvedených v tomto seznamu "
 "mezerami oddělenými Jabber ID místností."
 
-#: ../src/common/config.py:186
+#: ../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:189
+#: ../src/common/config.py:183
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3652,27 +3677,27 @@ msgstr ""
 "rozhraním, pro přenos souborů v případě překladu adres nebo přesměrováním "
 "portů."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Upozorni na události v systémovém trayi."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Zobrazit okraj panelu v oknech rozhovorů?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:202
+#: ../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 "
@@ -3683,16 +3708,16 @@ msgstr ""
 "oddělené čárkami. Povolené skupiny jsou 1, 2, 5, 14, 15, 16, 17 a 18. Vyšší "
 "čísla jsou více bezpečná, ale vyžadují delší dobu výpočtu při startu sezení."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
-#: ../src/common/config.py:217
+#: ../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."
@@ -3700,14 +3725,14 @@ msgstr ""
 "Pokud zapnuto, ukonči Gajim když bude stisknuto tlačítko X v titulku okna. "
 "Toto nastavení se použije pouze tehdy, pokud je použita ikona v trayi."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Pokud zapnuto, Gajim zkontroluje, zda je výchozí jabber klient, při každém "
 "startu."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3715,7 +3740,7 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí ikonu v každé záložce obsahující nepřečtené "
 "zprávy. V závislosti na tématu, tato ikona může být animovaná."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3723,11 +3748,11 @@ msgstr ""
 "Pokud zapnuto, Gajim zobrazí popis stavu, pokud není prázdný, pro každý "
 "kontakt pod jménem v okně Seznamu."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Nastavení pozice avatara v rosteru. Může být vlevo nebo vpravo"
 
-#: ../src/common/config.py:226
+#: ../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."
@@ -3735,7 +3760,7 @@ msgstr ""
 "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
 "naposledy avatara nebo kterého uložený je příliš starý."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3743,7 +3768,7 @@ msgstr ""
 "Pokud vypnuto, Gajim nebude zobrazovat stavové řádky v rozhovorech, když "
 "kontakt změní jeho stav a/nebo jeho stavovou zprávu."
 
-#: ../src/common/config.py:228
+#: ../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 "
@@ -3756,29 +3781,29 @@ msgstr ""
 "stavovou zprávu. Pokud je \"all\", Gajim bude vypisovat všechny změny stavů. "
 "Při \"in_and_out\" Gajim vypíše stav jenom při vstupu a odchodu z místnosti."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Barva pozadí kontaktů, jež se přávě odhlásili."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Pokud je povoleno, minulé zprávy budou vypsány menším písmem, než je výchozí."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: ../src/common/config.py:236
+#: ../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 "
@@ -3788,7 +3813,7 @@ msgstr ""
 "oknem (výchozí chování ve většině Window Managerů) pokud čekají nové "
 "události."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3799,7 +3824,7 @@ msgstr ""
 "neposílala v presenci u diskuzí."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:241
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3818,31 +3843,31 @@ msgstr ""
 "zvláštního okna. Vězte, že změna této volby vyžaduje restartování Gajimu, "
 "aby se projevila"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Pokud je False, nebudete nadále vidět avatary v okně rozhovoru"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Pokud je True, stiskem escape zavřete panel nebo okno"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: ../src/common/config.py:248
+#: ../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."
@@ -3851,15 +3876,15 @@ msgstr ""
 "stejný člověk, jako v předchozí zprávě."
 
 # FIXME: netusim co to je... najit
-#: ../src/common/config.py:249
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Jemné posouvání v okně diskuze"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3867,11 +3892,11 @@ msgstr ""
 "Seznam barev, oddělený pomocí \":\", použitý k obarvení přezdívek v "
 "diskuzích."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab jde na další rozepsanou záložku, když žádný není nepřečtená."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3879,7 +3904,7 @@ msgstr ""
 "Mám zobrazit dialog vytvoření metakontaktu nebo ne? Prázdný řetezec znamená "
 "nikdy nezobrazovat dialog."
 
-#: ../src/common/config.py:254
+#: ../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 "
@@ -3889,7 +3914,7 @@ msgstr ""
 "BUĎ OPATRNÝ, když jsi přihlášen se zápornou prioritou, nedostaneš od serveru "
 "žádnou zprávu."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3897,7 +3922,16 @@ msgstr ""
 "Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
 "k účtům."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Je-li povoleno, Gajim použije Gnome Keyring (je-li dostupný) k uložení hesel "
+"k účtům."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3905,7 +3939,7 @@ msgstr ""
 "Je-li povoleno, Gajim zobrazí počet dostupných a všech kontaktů v účtu a u "
 "řádků skupin."
 
-#: ../src/common/config.py:257
+#: ../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"
@@ -3913,7 +3947,7 @@ msgstr ""
 "Může být prázdný, 'chat' nebo 'message'. Není-lí prázdné, považuj všechny "
 "příchozí zprávy jako uvedený typ"
 
-#: ../src/common/config.py:258
+#: ../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."
@@ -3921,7 +3955,7 @@ msgstr ""
 "Je-li povoleno, Gajim bude posune a vybere kontakt, který vám poslal "
 "poslední zprávu, pokud již okno rozhovoru není otevřené."
 
-#: ../src/common/config.py:259
+#: ../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."
@@ -3929,11 +3963,11 @@ msgstr ""
 "Je-li povoleno, Gajim převede řetězec mezi $$ a $$ na obrázek pomocí dvips a "
 "převede před vložením do okna rozhovoru."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Čas neaktivity před zavřením okna změny stavu."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3941,18 +3975,18 @@ msgstr ""
 "Maximální počet řádků, které se vypíší v konverzacích. Nejstarší řádky jsou "
 "smazány."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 "Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3960,7 +3994,7 @@ msgstr ""
 "Změnou hodnoty změníte velikost zobrazovaných formulí latexu. Vyšší znamená "
 "větší."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:260
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -3969,13 +4003,13 @@ msgstr ""
 "Platná uri schémata. Pouze schémata v tomto seznamu budou akceptována jako "
 "\"správné\" URI. (mailto a xmpp jsou obsluhovány zvlášť)"
 
-#: ../src/common/config.py:266
+#: ../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:277
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3983,7 +4017,7 @@ msgstr ""
 "Priorita se změní automaticky podle tvého stavu. Priority jsou definovány v "
 "nastavení jako položky autopriority_*."
 
-#: ../src/common/config.py:285
+#: ../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"
@@ -3992,26 +4026,26 @@ msgstr ""
 "'nedostupný', 'nerušit', 'neviditelný'. POZNÁMKA: toto nastavení může být "
 "použito pouze pokud restore_last_status je vypnutý"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Je-li povoleno, nastaví se vždy poslední použitý stav."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Je-li zakázáno, spojení nebude podepsané GPG klíčem, pokud je GPG klíč "
 "nastavený."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Povolit ESessions šifrování pro tento účet."
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má se Gajim automaticky připojovat šifrovaným spojením je-li to možné?"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4019,28 +4053,28 @@ msgstr ""
 "Řazený seznam (oddělený mezerami) spojení, která má Gajim zkusit. Možnosti "
 "jsou: tls, ssl nebo plain"
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobrazit varování před použitím standartní SSL knihovny."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:304
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:305
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:309
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4050,11 +4084,11 @@ msgstr ""
 "pokusit o připojení."
 
 #. yes, no, ask
-#: ../src/common/config.py:317
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4062,15 +4096,15 @@ msgstr ""
 "Pokud je zaškrtnuto, Gajim použije Vaší IP a proxy servery definované ve "
 "volbě pro přenos souborů file_transfer_proxies."
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4078,112 +4112,112 @@ msgstr ""
 "Pokud sestavuji šifrované sezení, má Gajim přepokládat povolení "
 "zaznamenávání zpráv?"
 
-#: ../src/common/config.py:407
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:408
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 "Má Gajim uskutečnit šifrované spojení s tímto kontaktem je-li k dispozici?"
 
-#: ../src/common/config.py:409 ../src/common/config.py:412
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:420 ../src/common/config.py:422
-#: ../src/common/config.py:423 ../src/common/config.py:426
-#: ../src/common/config.py:427
+#: ../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' nebo ''"
 
-#: ../src/common/config.py:433 ../src/common/pep.py:160
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:130
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:437 ../src/common/pep.py:189
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:452 ../src/config.py:1412
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:455 ../src/common/config.py:456
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4191,97 +4225,97 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Přehraný zvuk při příchodu jakékoliv MUC zprávy."
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:239
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:480 ../src/common/optparser.py:225
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:488
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "mariňák"
 
-#: ../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 "Nelze nahrát 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 "Nesprávné jméno počítače"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Neplatná místní adresa? :-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 "Registrační informace pro transport %s nedorazily včas"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:684
 msgid "Registration succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:685
 #, fuzzy, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: ../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"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:970
-#: ../src/common/connection_handlers.py:1963
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2197
-#: ../src/common/connection_handlers.py:2330 ../src/common/connection.py:1355
-#: ../src/gajim.py:378
+#: ../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 "Chyba zápisu na disk (možná je plný?)"
 
-#: ../src/common/connection_handlers.py:1177 ../src/common/connection.py:929
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:1178 ../src/common/connection.py:930
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../src/common/connection_handlers.py:1791 ../src/common/connection.py:1170
-#: ../src/config.py:1840 ../src/config.py:1848 ../src/config.py:1891
-#: ../src/config.py:3116 ../src/dataforms_widget.py:571 ../src/dialogs.py:2462
+#: ../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 "Neplatné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1792
+#: ../src/common/connection_handlers.py:1892
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Přišla zpráva od neplatného JID a byla ignorována."
 
-#: ../src/common/connection_handlers.py:1966
-#: ../src/common/connection_handlers.py:2012
-#: ../src/common/connection_handlers.py:2200
-#: ../src/common/connection_handlers.py:2333 ../src/common/connection.py:1358
-#: ../src/gajim.py:159
+#: ../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."
@@ -4290,78 +4324,77 @@ msgstr ""
 "Nelze přečíst soubor databáze (%s). Opravte ho (viz http://trac.gajim.org/"
 "wiki/DatabaseBackup) nebo smažte (tím ztratítu všechny zprávy v historii)."
 
-#: ../src/common/connection_handlers.py:2084
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nepovolena: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2159
-#: ../src/common/connection_handlers.py:2162
-#: ../src/common/connection_handlers.py:2165
-#: ../src/common/connection_handlers.py:2168
-#: ../src/common/connection_handlers.py:2172 ../src/gajim.py:531
+#: ../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 "Nelze se připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:2160
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Máš zakázán přístup do diskuze %s."
 
-#: ../src/common/connection_handlers.py:2163
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Vytváření místností není povoleno."
 
-#: ../src/common/connection_handlers.py:2169
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
 
-#: ../src/common/connection_handlers.py:2173
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů diskuze %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2215
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: ../src/common/connection_handlers.py:2222
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Můžete se připojit do této místnosti: %s"
 
-#: ../src/common/connection_handlers.py:2249
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2270
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme nyní zapsáni k %s"
 
-#: ../src/common/connection_handlers.py:2272
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "byla nám zrušena autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2457
+#: ../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 "
@@ -4371,15 +4404,15 @@ msgstr ""
 "správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2482
+#: ../src/common/connection_handlers.py:2614
 #: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2484
+#: ../src/common/connection_handlers.py:2616
 #: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1931
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
@@ -4512,77 +4545,77 @@ msgstr "Použítý klíč neobsahuje podpis certifikátu"
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %s odpověděl chybně na požadavek regisrace: %s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s odpověděl chybně na požadavek registrace: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:762
-#: ../src/common/connection.py:1491
+#: ../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 "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1083
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:645
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:742
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:743
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Spojení s účtem %s bylo ztraceno. Opět se připojte."
 
-#: ../src/common/connection.py:709
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4591,7 +4624,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4600,24 +4633,24 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: ../src/common/connection.py:763
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:788
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:856
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4626,18 +4659,18 @@ msgstr ""
 "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených "
 "zdrojů. Zruště jeho používání a zkuste znovu."
 
-#: ../src/common/connection.py:1171 ../src/dialogs.py:2463
+#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Není možné poslat zprávu kontaktu %s, takové JID není platné."
 
 # FIXME: co to je?
-#: ../src/common/connection.py:1193
+#: ../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 "Není podepsaná přítomnost ani není přiřazen klíč."
 
-#: ../src/common/connection.py:1195
+#: ../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."
@@ -4645,11 +4678,11 @@ msgstr "Klíč kontaktu (%s) se neshoduje s klíčem v Gajimu."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
 
-#: ../src/common/connection.py:1345
+#: ../src/common/connection.py:1359
 #: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
@@ -4659,20 +4692,30 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1524 ../src/common/connection.py:1545
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Pozvat kontakt"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:988
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Přihlížející"
 
 #: ../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:801 ../src/roster_window.py:814
-#: ../src/roster_window.py:1469 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1684
+#: ../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 "Transporty"
 
@@ -4681,11 +4724,11 @@ msgid "Not in roster"
 msgstr "Není v rosteru"
 
 #. 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 bindings chybí na tomto počítači"
 
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Možnosti D-Bus nemohou být použity"
 
@@ -4714,356 +4757,356 @@ msgstr ""
 "Session bus není k dispozici.\n"
 "Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dvanáct"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "jeden"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dva"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tři"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "čtyři"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "pět"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "šest"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sedm"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "osm"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "devět"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "deset"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "jedenáct"
 
+#. 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 "dvanáct"
+msgid "%(0)s o'clock"
+msgstr "%(0)s hodin"
 
-#. 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 hodin"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "pět po $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "pět po %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "deset po $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "deset po %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "čtvrt po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "čtvrt po %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dvacet po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "dvacet po %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
 msgstr "dvacet pět po $%"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "půl $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "půl %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dvacet pět do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "dvacet pět do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dvacet do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "dvacet do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "tři čtvrtě na $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "tři čtvrtě na %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "za deset $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "za deset %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "za pět $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "za pět %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 hodin"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s hodin"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noc"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Brzy ráno"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Ráno"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Skoro poledne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Poledne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Odpoledne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Večer"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Pozdě večer"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Začátek týdne"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Uprostřed týdne"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Konec týdne"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "píše zprávu..."
 
 #. 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 "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:653
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:666
+#: ../src/common/helpers.py:656
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:660
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:663
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:677
+#: ../src/common/helpers.py:667
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:680
+#: ../src/common/helpers.py:670
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:683
+#: ../src/common/helpers.py:673
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1141 ../src/common/helpers.py:1148
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5071,22 +5114,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: ../src/common/helpers.py:1154
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr "z místností %s"
 
-#: ../src/common/helpers.py:1157 ../src/common/helpers.py:1176
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "od uživatele %s"
 
-#: ../src/common/helpers.py:1159
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5094,7 +5137,7 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: ../src/common/helpers.py:1206
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5110,20 +5153,20 @@ msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
 #. 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 "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:234 ../src/common/optparser.py:235
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:351
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP účet %s@%s"
@@ -5882,18 +5925,18 @@ msgstr "Vaše zpráva nemohla být odeslána."
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je offline. Vaše zpráva nemohla být odeslána."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:588
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Spojení k počítači nebylo navázáno:Vypršel čas při odesílání dat."
 
-#: ../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 "Chyba při přidávání služby. %s"
 
-#: ../src/config.py:151 ../src/config.py:610
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Vypnuto"
 
@@ -5905,20 +5948,12 @@ msgstr "Výchozí Zpráva"
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:446
-msgid "Always use OS/X default applications"
-msgstr "Vždy použít OS/X výchozí aplikace"
-
-#: ../src/config.py:447
-msgid "Custom"
-msgstr "Vlastní"
-
-#: ../src/config.py:676 ../src/dialogs.py:1301
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:677
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5927,206 +5962,206 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/config.py:1054
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1054
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "text stavu"
 
 #. Name column
-#: ../src/config.py:1334 ../src/dialogs.py:1929 ../src/dialogs.py:1993
-#: ../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 "Jméno"
 
-#: ../src/config.py:1420
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1421
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Pokud chcete, aby se změny projevily ihned, musíte se znovu přihlásit."
 
-#: ../src/config.py:1549 ../src/config.py:1650
+#: ../src/config.py:1521 ../src/config.py:1643
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP na tomto počítači není použitelné"
 
-#: ../src/config.py:1686 ../src/config.py:1729
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1687
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Přečtěte si všechny čekající zprávy, než smažete tento účet."
 
-#: ../src/config.py:1713
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všechna okna rozhovorů a diskuzí budou zavřena. Opravdu chceš pokračovat?"
 
-#: ../src/config.py:1725
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1726
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1730
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "Před změnou jména účtu si musíte přečíst všechny čekající zprávy."
 
-#: ../src/config.py:1736
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1737
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Toto jméno je už použito pro jiný účet. Zvolte jiné, prosím."
 
-#: ../src/config.py:1741 ../src/config.py:1745
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1742
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1746
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1821
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:1822
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:1849
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/config.py:2039 ../src/config.py:3176
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:2040 ../src/config.py:3177
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2061
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2062
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Nastala chyba při získávání Vašich OpenPGP privátních klíčů."
 
-#: ../src/config.py:2097
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2098
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2105
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2106
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Musíte vytvořit účet před úpravou vašich osobních údajů."
 
-#: ../src/config.py:2113 ../src/dialogs.py:1781 ../src/dialogs.py:1917
-#: ../src/dialogs.py:2096 ../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 "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2114
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2118
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2119
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2150
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2151
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím přejmenujte nebo odstraňte před povolením lokálních zpráv."
 
-#: ../src/config.py:2334
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2372
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2373
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2374
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2375
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2424 ../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:2434
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2441
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2447
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2476
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6134,37 +6169,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2479
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát členem?</b>\n"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2482
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát vlastníkem?</b>\n"
 
-#: ../src/config.py:2484
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2485
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Kdo se má stát správcem?</b>\n"
 
-#: ../src/config.py:2486
+#: ../src/config.py:2500
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6182,78 +6217,90 @@ msgstr ""
 "uživatel@doména),\n"
 "doména/zdroj, nebo adresa obsahující poddoménu."
 
-#: ../src/config.py:2583
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2605 ../src/gajim.py:1472 ../src/gajim.py:1559
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2606 ../src/gajim.py:1542
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2607 ../src/gajim.py:1559
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2616
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2713
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:2783
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:2816
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2817
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosím nezapomeňte vyplnit políčka server a místnost, nebo smažte tuto "
 "záložku."
 
-#: ../src/config.py:3099
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3101
-msgid "You must provide a username to configure this account."
-msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Přezdívka nepovolena: %s"
+
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Neplatný server"
 
-#: ../src/config.py:3133
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Neplatný záznam"
+
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3134 ../src/config.py:3325
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6262,24 +6309,32 @@ msgstr ""
 "Můžete nastavit rozšířené volby účtu po stisknutí tlačítka Rozšířené, nebo "
 "později stisknutím v položce menu Účty v nabídce Úpravy hlavního okna."
 
-#: ../src/config.py:3152
-msgid "Invalid server"
-msgstr "Neplatný server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Váš účet byl úspěšně vytvořen"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3153
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Musíte zadat uživatelské jméno před nastavením tohoto účtu."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Prosím zadejte server u kterého se chcete zaregistrovat."
 
-#: ../src/config.py:3204 ../src/gajim.py:2101
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3205 ../src/gajim.py:2102
+#: ../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 "Tento certifikát je již v souboru %s, takže nebude znova přidán."
 
-#: ../src/config.py:3273
+#: ../src/config.py:3339
 #, fuzzy, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6294,7 +6349,7 @@ msgstr ""
 "SSL Chyba: %s\n"
 "Přesto se chcete připojit na tento server?"
 
-#: ../src/config.py:3279 ../src/gajim.py:2126
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6305,67 +6360,63 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3304 ../src/config.py:3345
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3324
-msgid "Your new account has been created successfully"
-msgstr "Váš účet byl úspěšně vytvořen"
-
-#: ../src/config.py:3411
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3412
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/config.py:3565
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:3573
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:3608
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:3609
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:3611
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:3612
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:3613
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:3614
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:3615
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:3616
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:3617
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
-#: ../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"
@@ -6375,7 +6426,7 @@ msgstr ""
 "stranou. Pokud zůstává dlouho, zpráva je pravděpodobně\n"
 "ztracena."
 
-#: ../src/conversation_textview.py:579
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6384,69 +6435,74 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Konec"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:705
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:727
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
-#: ../src/conversation_textview.py:1203
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1207
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1241
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
 
-#: ../src/dataforms_widget.py:575
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je již na seznamu"
 
-#: ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID je již na seznamu. Vyberte jiné."
 
 #. Default jid
-#: ../src/dataforms_widget.py:587
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:590 ../src/dataforms_widget.py:592
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6490,116 +6546,116 @@ msgstr "Text stavu %s"
 msgid "Status Message"
 msgstr "Text stavu"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Toto jméno je již použito. Chcete přepsat text stavu?"
 
-#: ../src/dialogs.py:755
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Uložit jako přednastavený stav"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Napište jméno pro tento stav"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG číslo: "
 
-#: ../src/dialogs.py:783
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ číslo: "
 
-#: ../src/dialogs.py:784
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:821
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:823
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:980 ../src/dialogs.py:986 ../src/dialogs.py:991
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:987
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:1007
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:1043
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:1102
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:1113
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1121
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslední, nikoliv nejmenší, poděkování patří všem správcům instalačních "
 "balíčků."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1140
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6610,88 +6666,88 @@ msgstr ""
 "Musíš nainstalovat %s slovník k použití kontroly pravopisu, nebo vybrat jiný "
 "jazyk nastavením volby speller_language."
 
-#: ../src/dialogs.py:1706
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Žádost o autorizaci na účtu %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1709
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:1774 ../src/gajim.py:2773
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:1782
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemůžete vstoupit do diskuze pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:1872
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:1873 ../src/groupchat_control.py:1458
-#: ../src/groupchat_control.py:1742
-msgid "The nickname has not allowed characters."
-msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
-
-#: ../src/dialogs.py:1877 ../src/dialogs.py:1883
-#: ../src/groupchat_control.py:1930
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:1878 ../src/dialogs.py:1884
-#: ../src/groupchat_control.py:1931
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:1891
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:1918
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:1966
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:1990
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:2048
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:2051
+#: ../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:"
@@ -6699,275 +6755,300 @@ msgstr ""
 "Vyplňte Jabber ID nebo přezdívku kontaktu, se kterým chcete začít rozhovor:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2075 ../src/dialogs.py:2448 ../src/dialogs.py:2610
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:2076 ../src/dialogs.py:2449 ../src/dialogs.py:2611
-#: ../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 "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
-#: ../src/dialogs.py:2085 ../src/dialogs.py:2088
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:2088
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2116
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2116
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2121
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2160 ../src/notify.py:264 ../src/notify.py:505
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:2162 ../src/notify.py:272 ../src/notify.py:507
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2164 ../src/notify.py:295 ../src/notify.py:349
-#: ../src/notify.py:509 ../src/osx/growler.py:12
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:2164 ../src/notify.py:276 ../src/notify.py:350
-#: ../src/notify.py:509 ../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 "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:2165 ../src/notify.py:283 ../src/notify.py:350
-#: ../src/notify.py:510 ../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 "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:2165 ../src/gajim.py:1675 ../src/notify.py:519
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2167 ../src/gajim.py:1741 ../src/notify.py:512
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2169 ../src/gajim.py:1641 ../src/gajim.py:1708
-#: ../src/notify.py:514 ../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 "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2171 ../src/gajim.py:1783 ../src/gajim.py:1805
-#: ../src/gajim.py:1822 ../src/notify.py:516 ../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 "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2172 ../src/gajim.py:1786 ../src/notify.py:517
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2174 ../src/gajim.py:1493 ../src/notify.py:521
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:2176 ../src/notify.py:256 ../src/notify.py:523
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:2367 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2369 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2371 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2374 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2397 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2420 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2499 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2500 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:2551
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:2682
+#. 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 "Chtěl(a) bych si Vás přidat do mého Seznamu."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Adresa"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Náladový"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Skupina"
+
+#. 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 "Rád(a) bych si tě přidal(a) do seznamu."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:2742
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Pořadí: %s, akce: %s, typ: %s, hodnota: %s"
 
-#: ../src/dialogs.py:2747
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:2876
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:2972
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:2974
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte zadat jméno pro vytvoření privacy listu."
 
-#: ../src/dialogs.py:3077
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:3080
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3082
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:3092
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:3148
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:3158 ../src/dialogs.py:3209
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:3196
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:3214
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3279
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:3281
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
 #. # means number
-#: ../src/dialogs.py:3350
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "č."
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/dialogs.py:3946
+#: ../src/dialogs.py:4296
 #, fuzzy, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6978,19 +7059,19 @@ msgstr ""
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: %(sas)s"
 
-#: ../src/dialogs.py:3950
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:3956 ../src/dialogs.py:4043
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu ověřena"
 
-#: ../src/dialogs.py:3964
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Ověřit znovu"
 
-#: ../src/dialogs.py:3969
+#: ../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 "
@@ -7000,19 +7081,19 @@ msgstr ""
 "zprávy nebo vám poslat zprávu, je potřeba ověřit jejich identitu kliknutí na "
 "tlačítko dole."
 
-#: ../src/dialogs.py:3972 ../src/dialogs.py:4024 ../src/dialogs.py:4037
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NENÍ ověřena"
 
-#: ../src/dialogs.py:3979
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Ověřit..."
 
-#: ../src/dialogs.py:3991
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Ověřil(a) jste identitu kontaktu?"
 
-#: ../src/dialogs.py:3992
+#: ../src/dialogs.py:4342
 #, fuzzy, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7026,21 +7107,21 @@ msgstr ""
 "Autentizační řetězec (SAS) jako vy.\n"
 "Krátký Autentizační řetězec: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3993
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Mluvily jste se vzdáleným kontaktem a ověřil s ním SAS?"
 
-#: ../src/dialogs.py:4025
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Klíč kontaktu (%s) <b>se neshoduje</b> s klíčem přiřazeným v Gajimu."
 
-#: ../src/dialogs.py:4031
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
 
-#: ../src/dialogs.py:4038
+#: ../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."
@@ -7049,7 +7130,7 @@ msgstr ""
 "proto zpráva <b>nemůže</b> být zašifrovaná. Použijte Váš GPG klient pro "
 "nastavení důvěry."
 
-#: ../src/dialogs.py:4044
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7057,33 +7138,33 @@ msgstr ""
 "Tento kontakt má přiřazen GPG klíč a tomuto klíči důvěřujete, zprávy tedy "
 "budou šifrované."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:657
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../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."
@@ -7091,266 +7172,284 @@ msgstr ""
 "Služba na zadané adrese neexistuje, nebo neodpovídá. Zkontrolujte adresu a "
 "opakujte znovu."
 
-#: ../src/disco.py:662 ../src/disco.py:958
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:663
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohlížet."
 
-#: ../src/disco.py:700 ../src/disco.py:710
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: ../src/disco.py:757
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: ../src/disco.py:797
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:959
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skenuji %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1581
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1589
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Záložka je už nastavena"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Záložka byla úspěšně přidána"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 msgid "SSL certificat validation"
 msgstr "Validace SSL certifikátu"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Knihovna se používá k ověření certifikátu serveru pro zabezpečené spojení."
 
-#: ../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 "Je potřeba 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 ""
 "Serverless automaticky komunikuje s klienty detekovanými v místní síti."
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Je potřeba python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Je potřeba pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Command line"
 msgstr "Příkazový řádek"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 #, fuzzy
 msgid "A script to control Gajim via commandline."
 msgstr "Skript, který ovládá Gajim s příkazové řádky."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Je potřeba 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 "Vlastnost není k dispozici pod Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "OpenGPG message encryption"
 msgstr "Šifrování zpráv OpenGPG "
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Šifruji zprávy gpg klíči."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Je potřeba gpg a python-GnuPGInterface."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
 msgid "Network-manager"
 msgstr "Správce sítě (network-manager)"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Autodetekce stavu sítě."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Je potřeba gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Správa Sezení"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sezení Gajimu je uloženo při odhlášení a znovu načteno při přihlášení."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Je potřeba python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Password encryption"
 msgstr "Šifrování hesla"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslo může být bezpečně uloženo."
 
-#: ../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 "Je potřeba gnome-keyring a 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 "Schopnost připojit se na servery používající SRV záznamy."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Je potřeba dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Je potřeba nslookup pro použití SRV záznamů."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Kontrola Pravopisu"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Kontrola Pravopisu psaných zpráv."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires libgtkspell."
 msgstr "Vyžaduje libgtkspell."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Notification"
 msgstr "Upozornění"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Pasivní okna oznamující nové události."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 " Je potřeba python-notify nebo python-dbus ve spojení s notification-daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Tray ikona"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ikona v systémové liště zobrazující aktuální stav."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Je potřeba python-gnome2-extras nebo zkompilovaný trayicon modul ze zdrojáků "
 "Gajima."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Je potřeba PyGTK verze 2.10. nebo vyšší."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatický stav"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Funkce pro měření času nečinnosti pro nastavení automatického stavu."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Vyžaduje knihovnu libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Je potřeba 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 "Převede LaTeX výraz mezi $$ $$."
 
-#: ../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."
@@ -7358,7 +7457,7 @@ msgstr ""
 "Je potřeba texlive-latex-base a dvipng. Dále musíte nastavit 'use_latex' na "
 "True v Editoru rozšířeného nastavení."
 
-#: ../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."
@@ -7366,23 +7465,23 @@ msgstr ""
 "Je potřeba texlive-latex-base a dvipng (vše je v MikTeXu). Dále musíte "
 "nastavit 'use_latex' na True v Editoru rozšířeného nastavení."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "End to End šifrování zpráv"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "Šifruji zprávy."
 
-#: ../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 "Je potřeba python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST Generátor"
 
-#: ../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)."
@@ -7390,24 +7489,24 @@ msgstr ""
 "Generuje XHTML výstup pro RST kód (viz.: http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../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 "Je potřeba python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr "Bannery a klikatelné odkazy"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Funkce umožňující mít klikatelné URL odkazy v rozhovoru a předmětu diskuze."
 
-#: ../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 "Je potřeba python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Vlastnost"
 
@@ -7428,7 +7527,7 @@ msgstr "Průběh"
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
@@ -7436,7 +7535,7 @@ msgstr "Velikost: %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 "Vy"
 
@@ -7445,7 +7544,7 @@ msgstr "Vy"
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
 #: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Příjemce: "
@@ -7478,36 +7577,37 @@ msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Přenos souboru byl ukončen protistranou"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Přenos souboru zastaven"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
@@ -7516,49 +7616,49 @@ msgstr "Popis: %s"
 # #, python-format
 # msgid "Description: %s"
 # msgstr "Popis: %s"
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nemohu přepsat existující soubor \"%s\""
 
-#: ../src/filetransfers_window.py:334 ../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."
 msgstr "Soubor tohoto jména již existuje a ty nemáš oprávnění k jeho přepsání."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Co by jste rád(a) dělal(a)?"
 
 #. 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:360 ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:360 ../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 "Nemáš oprávnění k vytváření souborů v tomto adresáři."
 
-#: ../src/filetransfers_window.py:370
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:436
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7566,66 +7666,71 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:593 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:595 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:145
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vyžaduje k běhu X server. Končím..."
 
-#: ../src/gajim.py:174
+#: ../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 vyžaduje PyGTK 2.8 nebo novější"
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:171
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.8 nebo novější. Končím..."
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:173
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim potřebuje GTK 2.8 nebo novější"
 
-#: ../src/gajim.py:178
+#: ../src/gajim.py:174
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.8 nebo novější. Končím..."
 
 # FIXME: runtime je jak?
-#: ../src/gajim.py:183
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:185
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7634,21 +7739,21 @@ msgstr ""
 "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
 "verzi z %s"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
 
-#: ../src/gajim.py:192
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potřebuje k běhu pywin32"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7658,11 +7763,11 @@ msgstr ""
 "získat na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:352
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:353
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7670,35 +7775,35 @@ msgstr ""
 "Jiná instance Gajimu pravděpodobně již běží\n"
 "Přesto spustit?"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
 
-#: ../src/gajim.py:458
+#: ../src/gajim.py:443
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/gajim.py:459
+#: ../src/gajim.py:444
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:468
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/gajim.py:469
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7709,55 +7814,59 @@ msgstr ""
 "zaregistrována někým jiným.\n"
 "Níže vyber jinou přezdívku:"
 
-#: ../src/gajim.py:546
+#: ../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 "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:548
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: ../src/gajim.py:551
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
 
-#: ../src/gajim.py:602 ../src/notify.py:525 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gajim.py:926 ../src/gajim.py:930
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Chyba %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:940 ../src/gajim.py:954
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gajim.py:977 ../src/notify.py:527
+#: ../src/gajim.py:970 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: ../src/gajim.py:1002
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:1003
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: ../src/gajim.py:1015
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gajim.py:1016
+#: ../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?"
@@ -7765,77 +7874,77 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: ../src/gajim.py:1041 ../src/notify.py:529
+#: ../src/gajim.py:1034 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Zrušit autorizaci"
 
-#: ../src/gajim.py:1082
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:1271 ../src/groupchat_control.py:1169
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s se přejmenoval na %(new_nick)s"
 
-#: ../src/gajim.py:1289 ../src/groupchat_control.py:1344
-#: ../src/history_window.py:428 ../src/notify.py:251
+#: ../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 je nyní %(status)s"
 
-#: ../src/gajim.py:1356
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s nastavil předmět na %(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:1420 ../src/groupchat_control.py:1129
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
-#: ../src/gajim.py:1423
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastala změna nastavení netýkající se soukromí"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávání historie je zapnuto"
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávání historie je vypnuto"
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: ../src/gajim.py:1438
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: ../src/gajim.py:1473
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Pro připojení do místnosti %s je vyžadováno heslo. Zadejte"
 
-#: ../src/gajim.py:1507
+#: ../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"
@@ -7843,20 +7952,20 @@ msgstr ""
 "Nastavily jste Gajim aby používal GPG agenta, ale žádný GPG agent není "
 "spuštěný nebo vrátil chybné heslo.\n"
 
-#: ../src/gajim.py:1509
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gajim.py:1512
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:1535
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/gajim.py:1535
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7864,13 +7973,13 @@ msgid ""
 msgstr ""
 "Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
 
-#: ../src/gajim.py:1537 ../src/gajim.py:2184 ../src/gajim.py:2219
-#: ../src/groupchat_control.py:1871 ../src/message_window.py:212
-#: ../src/roster_window.py:3867
+#: ../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 "Příště _nezobrazovat"
 
-#: ../src/gajim.py:1545
+#: ../src/gajim.py:1540
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7879,12 +7988,12 @@ msgstr ""
 "Gnome Keyring je nainstalován ale není správně spuštěn (proměná prostředí "
 "není asi správně nastavena)"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1654
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7892,7 +8001,7 @@ msgstr[0] "Máte %d nepřečtený E-mail"
 msgstr[1] "Máte %d nepřečtené E-maily"
 msgstr[2] "Máte %d nepřečtených E-mailů"
 
-#: ../src/gajim.py:1667
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7907,34 +8016,44 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1738
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gajim.py:1806
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Odstraní kontakt ze Seznamu"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Chyba při čtení souboru:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Soubor %(filename)s od %(name)s byl úspěsně přijat."
 
 #. ft stopped
-#: ../src/gajim.py:1810
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Soubor %(filename)s byl uspěšně odeslán %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1827
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/gajim.py:1924
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7943,46 +8062,46 @@ msgstr ""
 "Nepodařilo se dešifrovat zprávu od %s\n"
 "Možná je falešná."
 
-#: ../src/gajim.py:1931
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Prosím zadejte nové uživatelské jméno pro lokální účet"
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2042
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gajim.py:2067
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7992,15 +8111,15 @@ msgstr ""
 "Chyba při ověřování SSL vertifikátu na vašem jabber serveru: %(error)s\n"
 "Chcete se přesto připojit?"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: ../src/gajim.py:2149
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8017,11 +8136,11 @@ msgstr ""
 "\n"
 "Chcete se stále připojit a aktualizovat otisk certifikátu?"
 
-#: ../src/gajim.py:2180 ../src/gajim.py:2215
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: ../src/gajim.py:2181
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8029,11 +8148,11 @@ msgstr ""
 "Chystáte se poslat vaše heslo nezabezpečeným spojením. Jste si jistý(á), že "
 "to skutečně chcete udělat?"
 
-#: ../src/gajim.py:2183 ../src/gajim.py:2218
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: ../src/gajim.py:2216
+#: ../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?"
@@ -8041,21 +8160,21 @@ msgstr ""
 "Abyste nemuseli posílat heslo nezabezpečeným připojením nainstalujte si "
 "PyOpenSSL. Jste si jisti, že to chcete udělat?"
 
-#: ../src/gajim.py:2236
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP uzel nebyl smazán"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2730 ../src/gajim.py:2752
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/gajim.py:2731
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8063,7 +8182,7 @@ msgstr ""
 "Vámi nastavené téma pro smajlíky nebylo nalezeno, proto budou smajlíci "
 "vypnuty "
 
-#: ../src/gajim.py:2753
+#: ../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 "
@@ -8073,56 +8192,39 @@ msgstr ""
 "aktualizovat formát v souboru emoticons.py. Viz.: http://trac.gajim.org/wiki/"
 "Emoticons "
 
-#: ../src/gajim.py:2779 ../src/roster_window.py:3355
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3058
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:3155
-msgid "Bookmark already set"
-msgstr "Záložka je už nastavena"
-
-#: ../src/gajim.py:3156
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Diskuze \"%s\" už je ve Vašich záložkách."
-
-#: ../src/gajim.py:3169
-msgid "Bookmark has been added successfully"
-msgstr "Záložka byla úspěšně přidána"
-
-#: ../src/gajim.py:3170
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Můžete spravovat Vaše záložky přes menu Akce ve vašem Seznamu."
-
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Zobrazí nápovědu pro konkrétní příkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "příkaz"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "zobraz nápovědu k příkazu"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Zobrazí nebo skryje okno Seznamu"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
-#: ../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"
@@ -8130,48 +8232,49 @@ msgstr ""
 "Vytiskne seznam všech kontaktů v rosteru. Každý kontakt se objeví na "
 "samostatném řádku"
 
-#: ../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 "účet"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "zobraz pouze kontakty zadaného účtu"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše seznam registrovaných účtů"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Změní stav účtu nebo účtů"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../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 "zpráva"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "text stavu"
 
-#: ../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"
@@ -8179,18 +8282,22 @@ msgstr ""
 "změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
 "účtů které mají povolenu volbu \"sync with global status\" "
 
-#: ../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 "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../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 "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
 #: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8385,51 +8492,56 @@ msgstr "URI k obsluze"
 msgid "Account in which you want to handle it"
 msgstr "Účet s kterým chcete manipulovat"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "Tělo zprávy"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "místnost"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID Místnosti"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Heslo pro vstup do místnosti"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Účet z kterého chcete vstoupit do místnosti"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8438,15 +8550,15 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../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 "Vypadá to, že Gajim neběží. Proto nemůžete použít gajim-remote"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8455,16 +8567,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8473,7 +8585,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:482
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8482,7 +8594,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:487
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8491,7 +8603,7 @@ msgstr ""
 "Parametr \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:506
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Nesprávné uri"
 
@@ -8508,15 +8620,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Vytvořte vaše nové téma."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "jméno tématu"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Nemůžete smazat právě používané téma"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
@@ -8530,141 +8642,154 @@ msgstr "Odesílání soukromé zprávy selhalo"
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Už nejsi v místnosti \"%(room)s\" nebo \"%(nick)s\" odešel(a)."
 
-#: ../src/groupchat_control.py:410
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:562
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:564
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server přidělil nebo změnil název vaší místnosti"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1158
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s byl zakázán od %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1167
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:1205 ../src/groupchat_control.py:1209
-#: ../src/groupchat_control.py:1214
+#: ../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 byli vyhozeni z místnosti: %(reason)s"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) vztah %(nick)s na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Vztah %(nick)s byl nastaven na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s nastavil(a) postavení %(nick)s na %(role)s"
 
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Postavení %(nick)s bylo nastaveno na %(role)s"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1342
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1457 ../src/groupchat_control.py:1741
-msgid "Invalid nickname"
-msgstr "Neplatné uživatelské jméno"
-
-#: ../src/groupchat_control.py:1482 ../src/groupchat_control.py:1500
-#: ../src/groupchat_control.py:1586 ../src/groupchat_control.py:1603
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_control.py:1516
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Místnost nemá žádné téma"
 
-#: ../src/groupchat_control.py:1528
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
 
-#: ../src/groupchat_control.py:1664
+#: ../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 "Přezdívka nenalezena: %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 ""
 "Použití: /%s <přezdívka|JID> [důvod], zakáže JID přístup do místnosti. "
 "Přezdívka nájemníka může být nahrazena, pokud neobsahuje \"@\". Pokud je JID "
 "právě v místnosti, bude vyhozen. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1671
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8673,7 +8798,7 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8682,7 +8807,7 @@ msgstr ""
 "Použití: /%s [důvod], uzavře toto okno nebo záložku, a vypíše důvod, pokud "
 "byl uveden."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8691,7 +8816,7 @@ msgstr ""
 "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
 "důvodem."
 
-#: ../src/groupchat_control.py:1687
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8700,17 +8825,16 @@ msgstr ""
 "Použití: /%s <místnost>@<server>[/přezdívka], nabízí vstup do místnosti "
 "místnost@server, případně s uvedenou přezdívkou."
 
-#: ../src/groupchat_control.py:1691
-#, 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 ""
 "Použití: /%s <přezdívka> [důvod], odstraní nájemníka určeného přezdívkou z "
 "místnosti a případně zobrazí důvod. NEpodporuje mezery v přezdívce."
 
-#: ../src/groupchat_control.py:1700
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8719,61 +8843,75 @@ msgstr ""
 "Použití: /%s <přezdívka> [zpráva], otevře okno se soukromou zprávou a odešle "
 "zprávu nájemníkovi určeném přezdívkou."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Použití: /%s , zobrazí jména nájemníků v místnosti."
 
-#: ../src/groupchat_control.py:1713
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Použití: /%s [téma], zobrazí nebo aktualizuje téma v aktuální místnosti."
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použití: /%s <zpráva>, odešle zprávu bez hledání jiných příkazů."
 
-#: ../src/groupchat_control.py:1865
+#: ../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 "Použití: /%s <přezdívka>, změní Vaši přezdívku v aktuální místnosti"
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
 
-#: ../src/groupchat_control.py:1867
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Pokud zavřete toto okno, budete odpojen(a) z této místnosti."
 
-#: ../src/groupchat_control.py:1904
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1905
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1910
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1937
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1938
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8781,22 +8919,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2111
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:2112 ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2402
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -8826,81 +8964,81 @@ msgstr "Detaily"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Chyba parsování souboru:"
 
 #. 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 "Nemůžu zapsat do %s. Podpora správy sezení nebude fungovat"
 
 #. 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 není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../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 "Vždy zkontroluj při startu, zda je Gajim výchozí Jabber klient."
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../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 ""
 "Obrázek nelze uložit ve formátu %(type)s. Uložit jako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
-#: ../src/history_manager.py:96
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
 #. holds jid
-#: ../src/history_manager.py:136
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. 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 "Přezdívka"
 
 #. 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 "Zpráva"
 
-#: ../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 "Chcete pročistit databázi? (VELICE NEDOPORUČUJEME POKUD GAJIM BĚŽÍ)"
 
-#: ../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 "
@@ -8914,27 +9052,27 @@ msgstr ""
 "\n"
 "V případě kliknutí na ANO prosím vyčkejte..."
 
-#: ../src/history_manager.py:433
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../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 v %(time)s řekl(a): %(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] "Vážně chcete smazat všechny záznamy historie vybraného kontaktu?"
 msgstr[1] "Vážně chcete smazat všechny záznamy historie vybraných kontaktů?"
 msgstr[2] ""
 
-#: ../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 "Tato operace je nevratná."
 
-#: ../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] "Vážně chcete smazat vybranou zprávu?"
@@ -9007,70 +9145,66 @@ msgstr "- zprávy budou zaznamenány"
 msgid "- messages will not be logged"
 msgstr "- zprvý nebudou zaznamenány"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: ../src/notify.py:259
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: ../src/notify.py:267
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
 
-#: ../src/notify.py:287
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová soukromá zpráva z místnosti %s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:292
+#: ../src/notify.py:285
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/notify.py:298
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/notify.py:567
+#: ../src/notify.py:555
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Obecné"
-
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2799
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2802
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2804 ../src/roster_window.py:2815
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
@@ -9101,46 +9235,46 @@ msgid ""
 msgstr ""
 "Nastala chyba při publikování Vašich osobních údajů, zkuste to později znovu."
 
-#: ../src/roster_window.py:285 ../src/roster_window.py:939
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1892
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho stav."
 
-#: ../src/roster_window.py:1904
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: ../src/roster_window.py:1930
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:2130 ../src/roster_window.py:3299
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2131 ../src/roster_window.py:3300
+#: ../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?"
@@ -9149,15 +9283,28 @@ msgstr ""
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
 # FIXME: mozna nejak lepe? :/
-#: ../src/roster_window.py:2157
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2298 ../src/roster_window.py:2535
+#: ../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 "Jste si jistý(á), že chcete opustit místnost \"%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 "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2299
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9165,16 +9312,16 @@ msgstr ""
 "Zprávy bude možné číst později, pokud máte povolený záznam historie a "
 "kontakt je v rosteru."
 
-#: ../src/roster_window.py:2536
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Musíš si je přečíst před smazáním transportu."
 
-#: ../src/roster_window.py:2539
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2540
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9182,11 +9329,11 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:2543
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2548
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9196,56 +9343,56 @@ msgstr ""
 "transportů:%s"
 
 #. it's jid
-#: ../src/roster_window.py:2679
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2687
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2688
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2747
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Odstranit také všechny kontakty v této skupině z Vašeho rosteru"
 
-#: ../src/roster_window.py:2786
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2787
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude smazán z Vašeho rosteru"
 
-#: ../src/roster_window.py:3139
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Chystáte se smazat \"%(name)s\" (%(jid)s) z vašeho rosteru.\n"
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9254,11 +9401,11 @@ msgstr ""
 "odpojeného."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3150
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../src/roster_window.py:3153
+#: ../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."
@@ -9266,16 +9413,16 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3160
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3165
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9284,20 +9431,20 @@ msgstr ""
 "Smazáním těchto kontaktů:%s\n"
 "také zrušíte autorizaci. Kontakty Vás tak vždy uvidí jako odpojeného."
 
-#: ../src/roster_window.py:3221
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte vytvořit účet před tím, než budete moci hovořit s jinými uživateli."
 
-#: ../src/roster_window.py:3774
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:3776
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9305,12 +9452,12 @@ msgstr ""
 "Tvůj server nepodporuje ukládání metakontaktů. Tyto informace nebudou při "
 "přístím připojení uloženy."
 
-#: ../src/roster_window.py:3861
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chystáte se vytvořit metacontact. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:3863
+#: ../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 "
@@ -9320,11 +9467,11 @@ msgstr ""
 "jsou užitečné, když jeden člověk má víc účtů v síti Jabber nebo účty v "
 "transportech."
 
-#: ../src/roster_window.py:3976
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:3987
+#: ../src/roster_window.py:4026
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9332,121 +9479,131 @@ msgstr[0] "Chcete poslat %s tento soubor:"
 msgstr[1] "Chcete poslat %s tyto soubory:"
 msgstr[2] "Chcete poslat %s tyto soubory:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Odeslat %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Pošle soubor kontaktu"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4664 ../src/roster_window.py:4735
-#: ../src/roster_window.py:4744 ../src/systray.py:216 ../src/systray.py:263
+#: ../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 "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4751
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4756
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:4793 ../src/systray.py:279
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4813
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4853
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:4915 ../src/roster_window.py:5016
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:4942
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:4950
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
 #. Send Group Message
-#: ../src/roster_window.py:5112 ../src/roster_window.py:5638
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5120
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5124
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
-#: ../src/roster_window.py:5535
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Rád bych si Vás přidal(a) do svého seznamu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
 #. Send single message
-#: ../src/roster_window.py:5719
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5775
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5783
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
-#: ../src/roster_window.py:5857
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5864
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
-#: ../src/roster_window.py:5944
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nová diskuze"
 
 #. History manager
-#: ../src/roster_window.py:6057
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:6066
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Připojit se do diskuze"
 
 # FIXME: nejak divne, asi spatne prelozene -ne myslim ze to je ok
-#: ../src/roster_window.py:6276
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
@@ -9468,16 +9625,16 @@ msgstr "Žádný výsledek"
 msgid "Disk WriteError"
 msgstr "Chyba zápisu na disk"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
-#: ../src/session.py:411 ../src/session.py:446
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
-#: ../src/session.py:413
+#: ../src/session.py:419
 #, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9492,7 +9649,7 @@ msgstr ""
 "\n"
 "\t\tJsou tyto volby přijatelné?"
 
-#: ../src/session.py:447
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9624,62 +9781,84 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:241
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:243
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:264
+#: ../src/vcard.py:268
 msgid "?Time:Unknown"
 msgstr "?Time:Neznámý"
 
-#: ../src/vcard.py:288 ../src/vcard.py:298 ../src/vcard.py:514
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:327
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Tento kontakt zajímá Váš stav, ale Vy se nezajímate o jeho stav"
 
-#: ../src/vcard.py:337
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Vy se zajímáte o stav kontaktu, ale on se nezajímá o Váš stav"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
 #. None
-#: ../src/vcard.py:341
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Vy ani kontakt se nezajímáte o stav toho druhého"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekáte na odpověď kontaktu na vaši žádost o autorizaci"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: ../src/vcard.py:355 ../src/vcard.py:410 ../src/vcard.py:539
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
+#~ msgid "B_OSH Port:"
+#~ msgstr "B_OSH Port:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Zobrazit _Seznam"
+
+#, fuzzy
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Vybrat účet pro synchronizaci"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Vždy použít OS/X výchozí aplikace"
+
+#~ msgid "Custom"
+#~ msgstr "Vlastní"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Přenos souboru byl ukončen protistranou"
+
+#~ msgid "Generic"
+#~ msgstr "Obecné"
+
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
@@ -9761,9 +9940,6 @@ msgstr "zdroj s prioritou "
 #~ msgid "Tune"
 #~ msgstr "Píseň"
 
-#~ msgid "Address"
-#~ msgstr "Adresa"
-
 #~ msgid "Avatar:"
 #~ msgstr "Avatar:"
 
diff --git a/po/da.po b/po/da.po
index 9947ff281..3a7ffdd4d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,16 +1,16 @@
 # Danish translations for Gajim package.
 # Copyright (C) 2007 GAJIM'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim package.
-# Niels Felsted Thorsen <felsted@fsfe.org>, 2007.
 #
+# Niels Felsted Thorsen <felsted@fsfe.org>, 2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-16 20:37+0100\n"
-"PO-Revision-Date: 2008-11-17 22:58+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:45+0200\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
-"Language-Team: \n"
+"Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgid "_Add Contact..."
 msgstr "_Tilføj Kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "Op_dag Tjenester"
 
@@ -60,7 +60,7 @@ msgid "_Personal Events"
 msgstr "_Personlige hændelser"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
@@ -92,6 +92,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Vælg venligst 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"
@@ -99,60 +103,54 @@ msgstr ""
 "Tilføj dette certifikat til listen af certifikater du stoler på.\n"
 "SHA1 fingeraftryk af certifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Tryk for at se egenskaber (som MSN, ICQ transporter) på jabber serveren"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Brug godkendelse"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Tilslut når jeg trykke Færdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Oprettelses Guide"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg vil br_uge"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Jeg vil _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hvis valgt vil Gajim huske adgangskoden for denne konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Kan håndteres..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Pro_xy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Gem adgangs_kode"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Server Egenskaber"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Sæt min profil når jeg tilslutter"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Brug tilpasset værtsnavn/port"
 
@@ -165,30 +163,31 @@ msgstr ""
 "til Jabber netværket"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Din JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avanceret"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Færdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Værtsnavn:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Adgangskode"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -196,11 +195,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Brugernavn:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -209,18 +203,16 @@ msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Information</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Konto"
 
@@ -229,23 +221,22 @@ msgid "Account Modification"
 msgstr "Ændring af Konto"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administrative handlinger"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Tilslut automatisk hvis tilslutningen tabes"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "T_ilslut når Gajim startes"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Ænd_re Adgangskode"
 
@@ -262,38 +253,36 @@ msgstr ""
 "vil TLS blive deaktiveret."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Vælg _Nøgle..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Tryk for at ændre kontoens adgangskode"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Tryk for at forespørge om autorisering for alle kontakter af en anden konto"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Tilslutning"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Redigere 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -301,17 +290,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "General"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Værtsnavn:"
 
@@ -334,7 +320,6 @@ msgstr ""
 "tilslutningen afbrydes pga et tidsudløb"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -344,7 +329,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -354,7 +338,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -370,43 +353,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som er gemt på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ingen nøgle er valgt"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Information"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../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:42
+#: ../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 "
@@ -417,7 +402,7 @@ msgstr ""
 "konto: Klienten med den højeste prioritet får hændelserne"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil automatisk ændres ifølge din status."
 
@@ -426,12 +411,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Ressour_ce:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -446,30 +431,25 @@ msgstr ""
 "Ressourcen med den højeste prioritet vil få hændelserne. (se under)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Gem _pgp-løsen (ikke sikkert)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Gem konversations _logger for alle kontakter"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live pakker"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Synkroniser kontakter"
@@ -479,21 +459,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Brug _SSL (gammel type)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Brug fil transport proxy"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Tilpas til 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:13
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -501,11 +476,21 @@ msgstr "_Navn:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Tilpas til status"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Brug godkendelse"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -513,21 +498,18 @@ msgstr ""
 "Hvis valgt vil Gajim spørge dig før din adgangskode bliver sendt over en "
 "usikker forbindelse."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "T_ilslut når Gajim startes"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Epost:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktiver"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Fornavn:"
 
@@ -536,7 +518,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Hvis valgt vil Gajim hente adgangskoden fra en GPG agent som seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -548,56 +529,98 @@ msgstr ""
 "Du bør også ændre opsætning tilsvarende på en evt. brandmur."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:679
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Efternavn:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Fle_t kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Om_døb"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Send hold-i-live pakker"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Synk_roniser konto status med global status"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Brug GPG _Agenten"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Brug tilpasset værtsnavn/port"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Brug personlig port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Redigere Personlig Information..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Aktiver"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Værtsnavn:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Kan håndteres..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "Ad_var mig før jeg bruger en usikker forbindelse"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "brug HTTP_PROXY miljøvariablen"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-tilføj"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-luk"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-fjern"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "brug HTTP_PROXY miljøvariablen"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "K_onto:"
@@ -783,7 +806,7 @@ msgid "All statuses"
 msgstr "Status For Alle"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Borte"
 
@@ -800,7 +823,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -809,7 +832,7 @@ msgid "Launch a command"
 msgstr "Kør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
@@ -930,7 +953,7 @@ msgstr "Sidst ændret:"
 msgid "New entry received"
 msgstr "Ny hændelse modtaget"
 
-#: ../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 "Du har modtaget en ny hændelse:"
 
@@ -974,11 +997,19 @@ msgstr "Skriv en ny adgangskode:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Skriv din nye status besked</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 "Forvalgte beskeder:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Gem som Forvalgt..."
 
@@ -1038,11 +1069,11 @@ msgstr "_Tilføj til Kontaktliste"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historie"
 
@@ -1150,7 +1181,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Når en filoverførsel er færdig, vis en pop op påmindelse"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Fortsæt"
 
@@ -1186,7 +1217,7 @@ msgstr ""
 "Kontakt række\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:752
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Fed"
 
@@ -1206,11 +1237,11 @@ msgstr "Gajim Tema Tilpasning"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../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 "Ikke aktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:753
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1258,7 +1289,7 @@ msgstr "Ændre _Emne..."
 msgid "Configure _Room..."
 msgstr "Tilpas _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 "_Bogmærke"
 
@@ -1290,23 +1321,37 @@ msgstr "_Administrator"
 msgid "_Ban"
 msgstr "_Udvis"
 
-#: ../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 "_Bloker"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kast ud"
 
-#: ../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 "_Ejer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Send en Privat Besked"
 
-#: ../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 "_Fjern blokering"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stemme"
 
@@ -1314,13 +1359,13 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lav en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Emne"
 
@@ -1339,7 +1384,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Loghistorie Håndterer</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 "Slet"
 
@@ -1369,7 +1415,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søg Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Samtale Historie"
 
@@ -1392,7 +1438,7 @@ msgstr "Søg:"
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
@@ -1419,8 +1465,8 @@ msgstr "For nylig:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Bliv med:"
 
@@ -1448,7 +1494,7 @@ msgstr "Minimer ved Automatisk Deltagelse"
 msgid "Print status:"
 msgstr "Skriv 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:"
 
@@ -1477,36 +1523,54 @@ msgid "<b>Settings</b>"
 msgstr "<b>Opsætning</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP Tilslutning\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Håndter Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Navn:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Adgangs_kode"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Type:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Brug godkendelse"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Værtsmaskine:"
+msgid "Use HTTP prox_y"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Brug godkendelse"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Brugernavn:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1556,7 +1620,7 @@ msgstr "Vis 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 "_Send"
 
@@ -1653,10 +1717,14 @@ msgstr ""
 "Tillad pop op påmindelser når jeg er _borte/ikke tilgængelig/travel/usynlig"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Spørg om status besked når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1670,19 +1738,19 @@ msgstr ""
 "Altid brug XFCE4 standard programmer\n"
 "Tilpasset"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Samtale besked:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Alti_d kontroller om Gajim er standard Jabber klient ved start"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1696,31 +1764,31 @@ msgstr ""
 "Frigjort kontaktvindue med samtale vindue grupperet per konto\n"
 "Frigjort kontaktvindue med samtale vindue grupperet per type"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Vis kontakternes _aktivitet i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis kontak_ternes melodier i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis kontakternes humør i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1730,7 +1798,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "vise i samtalevinduerne."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1740,7 +1808,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "sende til modparten."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1748,31 +1816,31 @@ msgstr ""
 "Gajim vil påminde dig med et pop op vindue i højre bund af skærmen når en "
 "kontakt logger af"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Skjul alle knapperne i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Hvis valgt vil Gajim også inkludere information om senderen af den nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Hvis valgt vil Gajim ændre status til Væk når computeren ikke bliver brugt."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1780,7 +1848,7 @@ msgstr ""
 "Hvis valgt vil Gajim ændre status til Ikke Tilgængelig når computeren ikke "
 "har været brugt i endnu længere tid"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1788,7 +1856,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1796,23 +1864,23 @@ msgstr ""
 "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
 "kontaktvinduet og i gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes aktivitet i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Hvis valgt vil Gajim vise i kontaktvinduet, hvilken melodi kontakten spiller"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1822,7 +1890,7 @@ msgstr ""
 "intet sprog er valgt ved at højreklikke i indtastningsfeltet, vil standard "
 "sproget blive brugt for denne kontakt eller gruppe samtale."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1832,7 +1900,7 @@ msgstr ""
 "kontakter. Brug med forsigtighed fordi det vil blokere alle beskeder fra "
 "alle kontakter som ikke er i kontaktvinduet."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1842,7 +1910,7 @@ msgstr ""
 "opmærksom på når der bruges E2E kryptering må den anden i samtalen godkende "
 "evt. logning, ellers vil samtalen i blive logget."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1850,7 +1918,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise en påmindelse når en ny e-post er modtaget via "
 "Gmail"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1860,7 +1928,7 @@ msgstr ""
 "kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
 "borte, Travlt, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1868,7 +1936,7 @@ msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1876,43 +1944,50 @@ msgstr ""
 "Hvis valgt vil Gajim erstatte tekst smileys som denne ':)' med den "
 "tilsvarende animerede eller statiske grafiske følelsesikon"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Log krypt_eret samtale session"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Gør samtalevinduer _kompakte"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Hå_ndtere..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Påmindelser"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Påmind mig om kontakter logger _ind"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Påmind mig om kontakter som logger u_d"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Påmind mig ved ny _GMail e-post"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Personlig Hændelser"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Afspil _lyde"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1922,19 +1997,24 @@ msgstr ""
 "Påmind mig om det\n"
 "Hvis kun i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Vis hændelse i systembakken"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Logge _ind"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Log _af"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1943,139 +2023,145 @@ msgstr ""
 "valgt\n"
 "vil Gajim kun vise den rå tekst."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Status _ikonsæt:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Den automatiske jeg er væk status besked. Hvis tom vil Gajim ikke ændre den "
 "nuværende status besked"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Den automatiske jeg er ikke tilgængelig status besked. Hvis tom vil Gajim "
 "ikke ændre den nuværende status besked"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Brug _transportens ikonsæt"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Brug system stan_dard"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Når en ny hændelse er modtaget:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "_Væk efter:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Netlæser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "Vis samtalestatus påmin_delser:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "Føl_elsesikoner:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Filhåndterer:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "Frem_hæv stavefejl"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer rigt indhold i indkommende beskeder"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Indkommende besked:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Log status ændringer hos kontakter"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_E-post klient:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "Ikke tilgæ_ngelig efter:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Åbn..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Udgående besked:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Nulstil til Standard Farver"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "_Send samtalestatus påmindelser:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Status besked:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_URL fremhævning:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Vinduets adfærd:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "i _gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "i _kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutter"
 
@@ -2123,7 +2209,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Bestil:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
@@ -2188,108 +2274,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Afdeling:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-post:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Ekstra Adresse:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Efternavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fuldt Navn</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Fornavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Hjemmeside:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellemnavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Navn:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Kælenavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Telefonnr.:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stilling:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Postnummer:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Stat:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gade:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Endetillæg:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Om"
 
@@ -2299,17 +2385,17 @@ msgstr "Tryk for at se din avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Personlig Information"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Arbejde"
 
@@ -2327,8 +2413,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Kan fjernes"
 
@@ -2350,14 +2436,14 @@ msgstr "Ændre _Grupper..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../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:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -2367,7 +2453,7 @@ msgstr "_Fjern"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
 
@@ -2392,12 +2478,6 @@ msgstr "Start _samtale"
 msgid "_Allow him/her to see my status"
 msgstr "Till_ad ham/hende at se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr "_Bloker"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Nægt ham/hende at se min status"
@@ -2419,16 +2499,34 @@ msgstr "_Omdøb..."
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr "_Fjern blokering"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "Ikke ign_orer"
 
+#: ../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 "gtk-luk"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-luk"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Tilføj Kontakt..."
@@ -2454,56 +2552,62 @@ msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Vis _Afkoblede Kontakter"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Vis _Afkoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
-msgstr "Vis _kontaktvindue"
-
 #: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Vis _Kontaktvindue"
+
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "K_ontoer"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Indhold"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_OSS"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Indstillinger"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "Send en Enkel _Besked..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Vis"
 
@@ -2520,11 +2624,11 @@ msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../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:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Søg"
 
@@ -2614,10 +2718,6 @@ msgstr "Abonnement Forespørgsel"
 msgid "_Deny"
 msgstr "_Nægt"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Vælg den konto som du vil synkronisere med"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Vælg den konto som du vil synkronisere med"
@@ -2642,10 +2742,6 @@ msgstr "Send en Enkel _Besked"
 msgid "Show All Pending _Events"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Vis _Kontaktvindue"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2663,49 +2759,54 @@ msgstr "<b>Spørg:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Stat:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abonnering:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Konfigureret avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Kontakt Information"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Mere"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Bruger avatar:"
 
@@ -2717,6 +2818,11 @@ msgstr "<b>Jabber Trafik</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Inddata</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktiver"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2745,13 +2851,13 @@ msgstr "Tilskriv Open_PGP Nøgle"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Ændre _Grupper"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Omdøb"
 
@@ -2775,30 +2881,26 @@ msgstr "Resource:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Ændre Konto"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Annuller 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 er i færd med at køre en kommando. Er du sikker på du vil afbryde den?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Tjeneste ændrede sessionsnøglen."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Tjeneste sendte malformeret data"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Tjeneste ændrede sessionsnøglen."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
@@ -2823,7 +2925,7 @@ msgstr "Heltal"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:772
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Farve"
 
@@ -2848,173 +2950,199 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Skjult"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Du har modtaget en ny hændelse:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Engelsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretonsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Tjekkisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Græsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Britisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Spansk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norsk (bokmål)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Hollandsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Kinesisk"
 
-#: ../src/chat_control.py:336
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Sprog for stavekontrollen"
 
 #. we are not connected
-#: ../src/chat_control.py:359 ../src/chat_control.py:555
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:360 ../src/chat_control.py:556
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Din besked kan ikke blive sendt før du er tilsluttet."
 
-#: ../src/chat_control.py:754
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Uforklaret"
 
-#: ../src/chat_control.py:755
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Syg"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:787
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakt Information"
 
-#: ../src/chat_control.py:1215 ../src/chat_control.py:1611
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Virkelig send denne fil?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Hvis du sender en fil til %s, vil han eller hun få at vide dit rigtige "
+"Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1237 ../src/chat_control.py:2107
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:904 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1369 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "En liste over aktive, færdige og stoppede filoverførsler"
+
+#: ../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 "Ukendt Artist"
 
-#: ../src/chat_control.py:1371 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: ../src/chat_control.py:1373 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: ../src/chat_control.py:1377 ../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"
@@ -3023,26 +3151,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> af <i>%(artist)s</i>\n"
 "fra <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1382
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s af %(artist)s\n"
-"fra %(source)s"
-
-#: ../src/chat_control.py:1506
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1591 ../src/dialogs.py:3911
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/chat_control.py:1592
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3050,50 +3169,50 @@ msgstr ""
 "Ingen GPG nøgle er valgt for denne kontakt. Derfor kan du ikke kryptere "
 "beskeder med GPG."
 
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1626
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
-#: ../src/chat_control.py:1628
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Session VIL IKKE blive logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1648
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "og godkendt"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1652
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "og IKKE godkendt"
 
 #. 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:1658
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3102,26 +3221,26 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: ../src/chat_control.py:1706
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Kommando er ikke understøttet for zeroconf konto."
 
-#: ../src/chat_control.py:1717 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/chat_control.py:1720 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Brug: /%s, rydder tekst vinduet"
 
-#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Brug: /%s, gem samtale knapper"
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1688
+#: ../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 "
@@ -3130,38 +3249,38 @@ msgstr ""
 "Brug: /%(command)s <handling>, sender handling til den nuværende gruppe "
 "samtale. Brug tredie person. (f.eks. /%(command)s eksploderer.)"
 
-#: ../src/chat_control.py:1731
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Brug: %s, sender en ping til kontakten"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Brug: /%s, send beskeden til kontakten"
 
-#: ../src/chat_control.py:1737 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjælp for /%s"
 
-#: ../src/chat_control.py:1870
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:1877
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: ../src/chat_control.py:1887
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3169,25 +3288,25 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1889
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1918 ../src/chat_control.py:1931
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var IKKE krypteret"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Den følgende besked var krypteret"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2295
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2296
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3195,15 +3314,15 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../src/chat_control.py:2446 ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2207 ../src/common/connection.py:1222
-#: ../src/gajim.py:170
+#: ../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 "Database Fejl"
 
-#: ../src/chat_control.py:2447
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3212,150 +3331,162 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2678
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "opretter log database"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 er en fil, men burde være et katalog"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 vil nu slutte"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s er et katalog men burde være en fil"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "opretter %s katalog"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Ændre status information"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Ændre status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Sæt tilstedeværelses type og beskrivelse"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Åben for samtaler"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Udvidet borte"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Forstyr ikke"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Ofline - ikke tilsluttet"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Din status er blevet ændret."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Forlad Gruppesamtaler"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s i %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Du detlager ikke i en gruppesamtale."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Vælg de gruppesamtaler du vil forlade"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Gruppesamtaler"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Du forlod de følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Videresend ulæste beskeder"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Alle ulæste beskeder er blevet videresendt."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Brug D-Bus og Påmindelses-dæmonen (Notification-Daemon) til at vise "
 "påmindelser"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før din status ændres til borte."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Væk som et resultat af at være inaktiv i mere end $T minutter)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S vil blive ombyttet med den nuværende status besked, $T ved automatisk væk "
 "tid."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før din status ændres til ikke tilgængelig."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr ""
 "$S (Ikke tilgængelig som et resultat af at være inaktiv i mere end $T "
 "minutter)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S vil blive erstattet med den nuværende status besked, $T ved ikke "
 "tilgængelig tid."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3363,21 +3494,21 @@ msgstr ""
 "kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3121
+#: ../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:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Aktiver link-local/zeroconf beskeder"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Sprog brugt af stavelseskontrollen"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3387,7 +3518,7 @@ msgstr ""
 "'nogen ganger' - skriv tid for hver print_ichat_every_foo_minutes minutter.\n"
 "'aldrig' - skriv aldrig tiden."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3398,18 +3529,18 @@ msgstr ""
 "upræcise klokke. 1 er den mest præcise klokke, 4 den mindst præcise. Dette "
 "bruges kun hvis print_time er 'nogen ganger'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings tegn."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Hvis sandt, ikke fjern */_. Således at *abc* bliver skrevet med fed skrift "
 "men * * bliver ikke fjernet."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3419,7 +3550,7 @@ msgstr ""
 "formatering hvis valgt. For syntaks, se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html (Hvis du vil bruge dette, installer docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3427,7 +3558,7 @@ msgstr ""
 "Tegn som tilføjes efter kælenavn når der bruges kælenavnsfuldførelse (tab) i "
 "en gruppesamtale."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3435,7 +3566,7 @@ msgstr ""
 "Tegnforslag til at tilføje efter det ønskede kælenavn, når det ønskede "
 "kælenavn er i brug af en anden i gruppesamtalen."
 
-#: ../src/common/config.py:161
+#: ../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 "
@@ -3446,19 +3577,19 @@ msgstr ""
 "[timer:minutter]. Se python dokumentationen for strftime: http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som bliver skrevet før kælenavnet i samtaler"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som bliver skrevet efter kælenavnet i samtaler"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Tilføj * og [n] i tittelen på kontaktvinduet?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3466,11 +3597,11 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindue/"
 "faneblad genåbnes."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Hvor mange minutter skal sidste linjer fra forrige samtale vare."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3478,11 +3609,11 @@ msgstr ""
 "Send besked med Ctrl+Enter og lave en ny linie med Enter (standard Mirabilis "
 "ICQ klient adfærd)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal gemmes for Ctrl+KeyUP."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3491,12 +3622,12 @@ msgstr ""
 "Enten en tilpasset url som indeholder %s hvor %s er ordet/frasen, eller "
 "'WIKTIONARY' som betyder brug wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Hvis valgt kan Gajim blive kontrolleret eksternt ved hjælp af gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3508,14 +3639,14 @@ msgstr ""
 "de synkroniserer med global status) baseret på status af "
 "netværksforbindelsen."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Send samtale status påmindelser. Kan være en af disse: all, composing_only, "
 "disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3523,7 +3654,7 @@ msgstr ""
 "Vis samtale status påmindelser i samtale vinduer. Kan være en af disse: all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3531,11 +3662,11 @@ msgstr ""
 "Når der ikke skrives tid for hver besked (print_time==sometimes), skriv "
 "tiden for hver x minutter."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spørg før et gruppesamtale vindue/faneblad lukkes."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3543,7 +3674,7 @@ msgstr ""
 "Altid spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3551,7 +3682,13 @@ msgstr ""
 "Aldrig spørg før et gruppesamtale vindue/faneblad lukkes, hvis den findes i "
 "denne mellemrums separerede liste af gruppesamtale jids."
 
-#: ../src/common/config.py:190
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3560,35 +3697,27 @@ msgstr ""
 "grænseflader, for filoverførsler i tilfælde af adresse omskrivning/port "
 "videresending."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard siger KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Vis påmindelse af hændelser i statusfelt ikonet."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Vis et faneblad når der kun er en samtale?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis faneblade i samtalevinduer?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Vis lukke knap i faneblad?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
-"dine beskeder logget?"
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3600,17 +3729,17 @@ msgstr ""
 "16, 17 og 18. Højere tal er mere sikre, men tager længere tid at udregne når "
 "du starter en session."
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvis nye beskeder i et påmindelses pop op vinduer?"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "En semikolon-separeret liste af ord som vil blive fremhævet i gruppesamtaler."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3618,14 +3747,14 @@ msgstr ""
 "Hvis Sandt, lukker Gajim når X knappen fra vindueshåndteringen klikkes. "
 "Denne indstilling tages der kun hensyn til hvis et statusfelt ikon bruges."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Hvis Sandt, vil Gajim kontrollere om den er standard jabber klient ved hver "
 "opstart."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3633,7 +3762,7 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise et ikon på hvert faneblad som indeholder ulæste "
 "beskeder. Afhængig af temaet, kan dette ikon være animeret."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3641,12 +3770,12 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
 "kontakt under kontaktnavnet i kontaktvinduet."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Definer positionen af avataren i kontaktvinduet. Kan være venstre eller højre"
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3654,7 +3783,7 @@ msgstr ""
 "Hvis Sandt, vil Gajim spørge for en avatar for hver kontakt som ikke havde "
 "en avatar sidste gang eller har en gemt som er for gammel."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3663,7 +3792,7 @@ msgstr ""
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3677,30 +3806,30 @@ msgstr ""
 "vil Gajim skrive alle status beskeder. Hvis \"in_and_out\" vil Gajim kun "
 "skrive FOO kommer/forlader gruppesamtalen."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Baggrundsfarve på kontakter når de netop har tilsluttet sig."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Baggrundsfarve på kontakter når de netop har afbrudt tilslutningen."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Hvis Sandt vil gamle beskeder fra forrige samtale bruge en mindre skrifttype "
 "end den som er standard."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis en avatar for selve transporten."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke hvis kontaktvindue i vindueslisten."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3710,7 +3839,7 @@ msgstr ""
 "vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder "
 "ventende begivenheder."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3721,7 +3850,7 @@ msgstr ""
 "sha information i gruppesamtaler."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3742,31 +3871,31 @@ msgstr ""
 "'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
 "bliver sendt til et specifikt vindue."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Hvis Falsk vil du ikke længere se en avatar i samtale vinduet."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Hvis Sandt vil tryk på escape tasten lukke et vindue/faneblad."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Skjuler knapperne i samtale vinduer."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Skjuler banneret i et to personers samtalevindue"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3774,15 +3903,15 @@ msgstr ""
 "I en samtale, vis kælenavn i begyndelsen af en linie kun når det ikke er den "
 "samme person som snakker som i forrige besked."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indrykning når man fletter ens kælenavne."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Udglattet rulning af beskeder i samtale vinduet"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3790,11 +3919,11 @@ msgstr ""
 "Liste af farver, separeret med \":\", som vil blive brugt til at farve "
 "kælenavne i gruppesamtaler."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab gå til næste faneblad når ingen er ulæste."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3802,7 +3931,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:256
+#: ../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 "
@@ -3812,7 +3941,7 @@ msgstr ""
 "konto i kontoændrings vinduet. VÆR FORSIGTIG, når du er logget med en "
 "negativ prioritet vil du IKKE modtage nogen beskeder fra din server."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3820,7 +3949,16 @@ msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
+"konto adgangskoder."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3828,7 +3966,7 @@ msgstr ""
 "Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
 "gruppe rækker."
 
-#: ../src/common/config.py:259
+#: ../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"
@@ -3836,7 +3974,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Hvis ikke tom, behandl alle indkommende "
 "beskeder som om de var af denne type"
 
-#: ../src/common/config.py:260
+#: ../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."
@@ -3844,7 +3982,7 @@ msgstr ""
 "Hvis Sandt vil Gajim rulle ned/op og vælge den kontakt som sendte dig den "
 "sidste besked, hvis ikke allerede kontaktvinduet er åbent."
 
-#: ../src/common/config.py:261
+#: ../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."
@@ -3852,12 +3990,12 @@ msgstr ""
 "Hvis Sandt vil Gajim omdanne strengen mellem $$ og $$ til et billede med "
 "dvips og omdanne det inden det bliver sat ind i et samtale vindue."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tid med inaktivitet der skal gå før vinduet til at ændre status lukkes."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3865,7 +4003,7 @@ msgstr ""
 "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver "
 "slettet."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3873,11 +4011,11 @@ msgstr ""
 "Hvis sandt vil påmindelses vinduer fra påmindelses dæmonen blive fæstet til "
 "ikonet i systembakken."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3885,15 +4023,22 @@ msgstr ""
 "Du kan ændre værdien for at ændre størrelsen af latex formler som bliver "
 "vist. Jo højere jo større."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:260
+#, fuzzy
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 "Gyldige uri skemaer. Kun skemaer i denne liste vil blive accepteret som "
 "\"rigtige\" uri."
 
-#: ../src/common/config.py:278
+#: ../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."
@@ -3901,7 +4046,7 @@ msgstr ""
 "Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
 "defineret i autopriority_* indstillingerne."
 
-#: ../src/common/config.py:286
+#: ../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"
@@ -3910,26 +4055,26 @@ msgstr ""
 "væk, ikke tilgængelig, vil ikke forstyrres, usynlig. NOTE: denne "
 "valgmulighed bliver kun brugt hvis restore_last_status er deaktiveret"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Hvis valgt, gendan den sidste status som var brugt."
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Hvis deaktiveret, ikke signer tilstedeværelser med GPG nøgle, selvom GPG er "
 "konfigureret."
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne konto."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en krypteret session når det er muligt?"
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -3937,35 +4082,44 @@ msgstr ""
 "En ordnet liste (adskilt af mellemrum) af forbindelses typer som skal "
 "prøves. Kan indeholde tls, ssl eller plain"
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Hvis en advarsels dialog før brugen af standard SSL biblioteket."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
 
-#: ../src/common/config.py:312
+#: ../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
+#, fuzzy
 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 ""
 "Hvor mange sekunder skal der ventes på svaret af en holdilive pakke, før vi "
 "prøver at forbinde igen."
 
 #. yes, no, ask
-#: ../src/common/config.py:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 tilpasning"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3973,19 +4127,27 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Svar til modtagelses forespørgsel"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Sendte modtagelses forespørgsler"
 
-#: ../src/common/config.py:389
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
+"dine beskeder logget?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3993,101 +4155,101 @@ msgstr ""
 "Skal Gajim automatisk starte en krypteret session med denne kontakt når det "
 "er muligt?"
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprog som vi vil bruge til at kontrollere for stavefejl"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "alt eller mellemrums separeret status"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nej', eller 'begge'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 "'ja', 'nej' eller ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Arbejder"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Ude"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4096,68 +4258,99 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en hvilken som helst MUC besked ankommer."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "menneske"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Forkert vært"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings information for transporten %s har ikke ankommet i tide"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1845
-#: ../src/common/connection_handlers.py:1891
-#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2205 ../src/common/connection.py:1220
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Registrer til %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Tilslutning Fejlede"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Disk skrivefejl"
 
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2208 ../src/common/connection.py:1223
-#: ../src/gajim.py:171
+#: ../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 "Ugyldigt Jabber ID"
+
+#: ../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: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."
@@ -4166,78 +4359,77 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den (se http://trac."
 "gajim.org/wiki/DatabaseBackup) eller fjerne den (hele historikken vil tabes)."
 
-#: ../src/common/connection_handlers.py:1966
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kælenavn er ikke tilladt: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2041
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:556
+#: ../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 "Ikke i stand til at deltage i gruppesamtale."
 
-#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2055
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nu på %s"
 
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "forespørsel om ophør på abonnement fra %s"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nu abonnerer vi ikke længere på %s"
 
-#: ../src/common/connection_handlers.py:2331
+#: ../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 "
@@ -4248,216 +4440,221 @@ msgstr ""
 "jabberstudio.org/ til at fjerne det."
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2356
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP adgangskode blev ikke givet"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2358
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 vil blive tilsluttet til %s uden OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Ikke i stand til at skaffer udstedelses certifikat"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Ikke i stand til at skaffe certifikat CRL"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Ikke i stand til at dekryptere certifikatets signatur"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Ikke i stand til at dekryptere CRL's signatur"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Ikke i stand til at dekode udstederens offentlige nøgle"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Certifikat signaturen fejlede"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "CRL signatur fejl"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Certifikatet er udløbet"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "CRL er endnu ikke gyldigt"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "CRL er udløbet"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Formateringsfejl i certifikatets notBefore felt"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Formateringsfejl i certifikatets notAfter felt"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Formateringsfejl i CRL's lastUpdate felt"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Formateringsfejl i CRL's nextUpdate felt"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Ikke mere hukommelse"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Selvsigneret certifikat"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Selvsigneret certifikat i certifikats kæden"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "Ikke i stand til at skaffe lokalt udstedelses certifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "Ikke i stand til at verificere det første certifikat"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Certifikat kæde er for lang"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Certifikat tilbagekaldt"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Ugyldig CA certifikat"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Sti længde begrænsning overskredet"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Ikke understøttet formål for certifikatet"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Certifikatet er ikke til at stole på"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Certifikatet afvist"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Emne udsteder uoverensstemmelse"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Autoritet og emne nøgle identifikations uoverensstemmelse"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Autoritet og udstedelses serie nummer uoverensstemmelse"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "Nøglebrug indeholder ikke certifikat signering"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Server %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s svarede forkert på indskrivnings forespørgslen: %(error)s"
 
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Tilslutning til proxy fejlede"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1355
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Gemt i: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Tilslutning til proxy fejlede"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "Tilslutning til kontoen \"%s\" er blevet afbrudt. Prøv at tilslutte igen."
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Ægtheden af %s certifikatet kan være ugyldig."
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4466,7 +4663,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4475,24 +4672,24 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Kontroller din tilslutning eller prøv igen senere"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4501,26 +4698,31 @@ msgstr ""
 "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine "
 "tilsluttede ressourcer. Deaktivér den og prøv igen."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 er ikke mulig at sende tomme filer"
+
+#: ../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 ""
 "Den fjerne tilstedeværelse er ikke signeret og en nøgle blev ikke angivet."
 
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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 "Kontaktens nøgle (%s) passer ikke til den angivne nøgle i Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1105
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1210
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4529,19 +4731,30 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1388
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Inviter _Kontakter"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Iagttagere"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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"
 
@@ -4550,11 +4763,11 @@ msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne computer"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus evner kan ikke bruges"
 
@@ -4585,1043 +4798,1053 @@ msgstr ""
 "Sessions bussen er ikke tilgængelig.\n"
 "Prøv at læse http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "tolv"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "en"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "to"
 
-#: ../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 "fire"
 
-#: ../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 "seks"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "syv"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "otte"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "ni"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "ti"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "elleve"
 
+#. 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 "klokken $0"
+msgid "%(0)s o'clock"
+msgstr "klokken %(0)s"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem over $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "fem over %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ti over $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "ti over %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart over $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "kvart over %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "tyve over $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "tyve over %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "femogtyve over $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "femogtyve over %(0)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 "femogtyve minutter i $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "femogtyve minutter i %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "tyve minutter i $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "tyve minutter i %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvart på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "kvart på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ti på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "ti på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fem på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "fem på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "klokken $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "klokken %(1)s"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Nat"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Tidlig morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Næsten middag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Middag"
 
-#: ../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 "Aften"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Sen aften"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Ugestart"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Midten af ugen"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Slutten af ugen"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server adresse påkrævet."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Travlt"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "Ti_lgængelig"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Væk"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Deltagere"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Deltager"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Ejer"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "komponerer en besked..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d besked venter"
 msgstr[1] "%d beskeder venter"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr "fra rum %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "fra bruger %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " fra %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hændelse venter"
 msgstr[1] "%d hændelser venter"
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Fejl under kørsel af \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s er ikke et gyldigt logniveau"
+
 #. 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 "fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim konto %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "fra konto %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Bange for"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Forbavset"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Erotisk"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Gal"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Misfornøjet"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Ængstelig"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Vækket"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Skamfuld"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Keder mig"
 
-#: ../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 "Rolig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Forsigtig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Fryser"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Sikker"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Dybsindig"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Tilfreds"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Forskruet"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Vanvittig"
 
-#: ../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 "Nysgerrig"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Nedslået"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Deprimeret"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Væmmes"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Forfærdet"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Forstyrret"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Misundelig"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Spændt"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Flirtende"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustreret"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Taknemlig"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Sørge"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Gnaven"
 
-#: ../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 "Håbefuld"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Ydmyg"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Ydmyget"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Imponeret"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Ærefrygt"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Indigneret"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Interesseret"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Uovervindelig"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Jaloux"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Tabt"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Heldig"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Ondskabsfuld"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Gnaven"
 
-#: ../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 "Fornærmet"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Oprørt"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Spøgefuld"
 
-#: ../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 "Afslappet"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Hvileløs"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Trist"
 
-#: ../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 "Tilfreds"
 
-#: ../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 "Sjokeret"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Genert"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Syg"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../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 "Stresset"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Stærk"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Taknemlig"
 
-#: ../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æt"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Uforklaret"
 
-#: ../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 "Bekymret"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Laver Husarbejde"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Køber ind"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Gør Rent"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Laver Mad"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Gør Vedligeholdsarbejde"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Vasker op"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Vasker Tøj"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Laver Havearbejde"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Løber et Ærinde"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Går tur med hunden"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Drikker en Øl"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Drikke Kaffe"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Drikker Te"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Spiser et lille Mellemmåltid"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Spiser Morgenmad"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Træner"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Cykler"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Danser"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Vandrer"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Dyrker Sport"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Løber"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Står på ski"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Træner"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Plejer"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "I Spabad"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Børster Tænder"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Bliver Klippet"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Barberer"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Tager et Bad"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Tager et Brusebad"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Har en Aftale"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Hænge ud"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Skjult"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "Få Ferie"
 
-#: ../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 "Planlagt Ferie"
 
-#: ../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 "Slapper af"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Fisker"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Går ud"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Fester"
 
-#: ../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 "Øver"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Køber ind"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Ryger"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Socialiserer"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Solbader"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Ser 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 "Taler"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "I det virkelige liv"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Snakker i telefon."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Taler i Video Telefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Rejser"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Kører"
 
-#: ../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 Bus"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "Flyver"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "Kører i tog"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "På Rejse"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Går"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "I et Møde"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Skriver"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Ikke i stand til at tildele port %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5630,7 +5853,7 @@ msgstr ""
 "annulleret."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5638,14 +5861,7 @@ msgstr ""
 "[Dette er en del af en krypteret session. Hvis du ser denne besked gik noget "
 "galt.]"
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Tilslutning til vært kunne ikke etableres: Tidsudløb mens data var blevet "
-"sendt."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5654,17 +5870,17 @@ msgstr ""
 "Værten %s du konfigurerte i ft_add_hosts_to_send avancerte indstillinger er "
 "ikke gyldig, så den bliver ignoreret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "For at kunne fortsætte med at sende og modtage beskeder, må du tilslutte dig "
 "igen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi fejl"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5673,31 +5889,31 @@ msgstr ""
 "%s\n"
 "Link-local beskeder vil sandsynligvis ikke virke ordentligt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontroller venligst om Avahi eller Bonjour er installeret."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ikke i stand til at tildele port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontroller venligst om avahi-dæmonen kører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke ændre status på kontoen \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5705,59 +5921,50 @@ msgstr ""
 "Du er ikke tilsluttet eller synlig for andre. Din besked kunne ikke sendes."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Denne besked er krypteret]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Din besked kunne ikke sendes."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt er afkoblet. Din besked kunne ikke sendes."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Tilslutning til vært kunne ikke etableres: Tidsudløb mens data var blevet "
+"sendt."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Ikke aktiveret"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Hændelse"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr "Altid brug OS/X standard programmer"
-
-#: ../src/config.py:455
-msgid "Custom"
-msgstr "Tilpasset"
-
-#: ../src/config.py:650 ../src/dialogs.py:1200
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5766,105 +5973,70 @@ msgstr ""
 "For at bruge stavekontrollen må du installer en %s ordbog, eller vælge et "
 "andet sprog ved indstillingen for sprog til stavekontrollen."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "status besked tekst"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Første Besked er Modtaget"
-
-#: ../src/config.py:1054
-msgid "Next Message Received Focused"
-msgstr "Næste Besked Modtages i Fokus"
-
-#: ../src/config.py:1056
-msgid "Next Message Received Unfocused"
-msgstr "Næste Besked Modtages uden Fokus"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kontakt er Tilsluttet"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kontakt er ikke Tilsluttet"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Besked er Sendt"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Gruppe Samtale Besked Fremhævning"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Gruppe Samtale Besked Modtaget"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "GMail E-post Modtaget"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Navn"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Log ind igen nu?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Hvis du vil at alle ændringerne skal træde i kraft nu, må du logge ind igen."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Ulæste hændelser"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Alle samtale og gruppesamtale vinduer vil blive lukket. Vil du fortsætte?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "For at ændre kontonavnet må du læse alle ventende hændelser."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Kontonavnet er allerede i brug"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5872,144 +6044,139 @@ msgstr ""
 "Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
 "andet navn."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Ugyldigt kontonavn"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Kontonavnet kan ikke være tomt."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Ugyldigt Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Et Jabber ID må være på formen \"bruger@servernavn\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Der opstod et problem under forsøget på at hente dine OpenPGP nøgler."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Du må oprette en konto før du kan redigere din personlige information."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1676 ../src/dialogs.py:1812
-#: ../src/dialogs.py:1991 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Uden en tilslutning kan du ikke redigere din personlige information."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Omdøb eller fjern den før du aktiverer link-local beskeder."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6017,11 +6184,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6029,11 +6196,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6041,11 +6208,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6053,14 +6220,15 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 være en af de følgende:\n"
 "1. bruger@domæne/resource (kun denne resource træffer).\n"
@@ -6069,84 +6237,89 @@ msgstr ""
 "4. domæne (domænet træffer, ligeledes et hvilken som helst bruger@domæne,\n"
 "domæne/resource, eller adresse indeholdende et subdomæne."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Gå kun ind og ud"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Fyld ud server og rum tekstindtastningsfelterne eller fjern dette bogmærke."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
-msgstr "Ugyldigt brugernavn"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Ugyldigt kælenavn"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Du må give et brugernavn for at konfigurere denne konto."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Kælenavn er ikke tilladt: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Jabber ID eksisterer"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Ugyldigt server"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Denne konto er allerede konfigureret i Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Ugyldig indgang"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6156,25 +6329,33 @@ msgstr ""
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3137
-msgid "Invalid server"
-msgstr "Ugyldigt server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Din nye konto er blevet oprettet med succes"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Ugyldigt brugernavn"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Du må give et brugernavn for at konfigurere denne konto."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Anfør en server som du vil registrere dig ved."
 
-#: ../src/config.py:3189 ../src/gajim.py:2000
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3190 ../src/gajim.py:2001
+#: ../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 ""
 "Dette certifikat er allerede i filen %s, så det bliver ikke tilføjet igen."
 
-#: ../src/config.py:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6189,7 +6370,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3264 ../src/gajim.py:2024
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6200,23 +6381,63 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Din nye konto er blevet oprettet med succes"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Hændelse"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Første Besked er Modtaget"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Næste Besked Modtages i Fokus"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Næste Besked Modtages uden Fokus"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontakt er Tilsluttet"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontakt er ikke Tilsluttet"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Besked er Sendt"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Gruppe Samtale Besked Fremhævning"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Gruppe Samtale Besked Modtaget"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "GMail E-post Modtaget"
+
+#: ../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"
@@ -6227,7 +6448,7 @@ msgstr ""
 "ikon forbliver på skærmen længe er det sandsynlig\n"
 "at beskeden gik tabt."
 
-#: ../src/conversation_textview.py:568
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6235,74 +6456,74 @@ msgstr ""
 "Teksten under denne linje er hvad der er blevet sagt siden\n"
 "sidste gang du var opmærksom på denne gruppe samtale"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Afslut"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbogens URL mangler en \"%s\" og det må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Fejl under kørsel af \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dage siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber ID er allerede i listen"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Den Jabber ID som de skrev er allerede i listen. Vælg en anden."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6317,27 +6538,27 @@ msgstr "Kontakt navn: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Nøgle ID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Sæt Humørstemning"
 
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Besked"
@@ -6346,112 +6567,112 @@ msgstr "%s Status Besked"
 msgid "Status Message"
 msgstr "Status Besked"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Besked?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Dette navn er allerede i brug. Vil du overskrive denne status besked?"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Gem som Forvalgt Status Besked"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Skriv et navn for denne status besked"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresse:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyld ind data for den kontakt som du vil tilføje kontoen med navnet %s"
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyld ind data for den kontakt som du vil tilføje"
 
-#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabber klient"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1014
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1020
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1026
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sidst men ikke mindst, vil vi gerne takke alle pakke vedligeholdere."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1039
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6464,88 +6685,88 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1605
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Kælenavnet har ikke tilladte tegn."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Forespørgsel på abonnering for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1608
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:1669 ../src/gajim.py:2624
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan kun deltage i en gruppe samtale hvis du er tilsluttet."
 
-#: ../src/dialogs.py:1696
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:1767
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-msgid "The nickname has not allowed characters."
-msgstr "Kælenavnet har ikke tilladte tegn."
-
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:1813
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan kun synkronisere dine kontakter når du er tilsluttet."
 
-#: ../src/dialogs.py:1827
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan kun synkronisere med en konto hvis du er tilsluttet."
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:1946
+#: ../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:"
@@ -6554,276 +6775,301 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../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 "Vær venligst sikker på at du er tilsluttet med \"%s\"."
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2016
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Ny Besked"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Ny Enkel Besked"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Ny Privat Besked"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../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:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Formular %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Konsol"
 
-#: ../src/dialogs.py:2559
+#. 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 "Jeg vil gerne tilføje dig til min kontakt liste."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Gnaven"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Gruppe"
+
+#. 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 "Jeg vil gerne tilføje dig til min kontaktliste."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rækkefølge: %(order)s, handling: %(action)s, type: %(type)s, værdi: %(value)s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må indtaste et navn for at skabe en privatlivs liste."
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 "$Contact har inviteret dig til at deltage i en gruppe samtale %(room_jid)s"
 
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
 #. # means number
-#: ../src/dialogs.py:3228
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3352
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "når jeg er"
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6834,19 +7080,19 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng er: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3831
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:3837 ../src/dialogs.py:3924
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet er verificeret"
 
-#: ../src/dialogs.py:3845
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verificer igen..."
 
-#: ../src/dialogs.py:3850
+#: ../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 "
@@ -6856,19 +7102,19 @@ msgstr ""
 "beskeder eller sende dig beskeder, må du verificere deres identitet ved at "
 "trykke på knappen under."
 
-#: ../src/dialogs.py:3853 ../src/dialogs.py:3905 ../src/dialogs.py:3918
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet er IKKE verificeret"
 
-#: ../src/dialogs.py:3860
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verificer..."
 
-#: ../src/dialogs.py:3872
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den kontaktens identitet?"
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6883,23 +7129,23 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med den fjerne kontakt og verificeret KÆS?"
 
-#: ../src/dialogs.py:3906
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøgle (%s) <b>passer ikke</b> til den angivne nøgle i Gajim."
 
-#: ../src/dialogs.py:3912
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
 "beskeder."
 
-#: ../src/dialogs.py:3919
+#: ../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."
@@ -6908,7 +7154,7 @@ msgstr ""
 "nøgle</b>, så beskeder <b>kan ikke</b> krypteres. Brug din GPG klient til at "
 "ændre dette."
 
-#: ../src/dialogs.py:3925
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -6916,33 +7162,33 @@ msgstr ""
 "GPG Nøgle er tildet til denne kontakt, og du stoler på denne nøgle, så "
 "beskeder vil blive krypteret."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konference"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Du kan kun gennemse tilgængelige tjenester hvis du er tilsluttet"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6950,265 +7196,294 @@ msgstr ""
 "Der er ikke nogen tjenester på den adresse som du indtastede, eller serveren "
 "gav intet svar. Kontroller adressen og prøv igen."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne type tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Kør Kommando"
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Brugere"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "Bogmærke er allerede sat"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bogmærket er blevet tilføjet succesfuldt"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Knude"
 
-#: ../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 "_Abonner"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "SSL certifikat fejl"
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek brugt til at validere server certifikater for at sikre en "
 "sikker forbindelse."
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Kræver python-pyopenssl."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk opdagede klienter i et lokalt netværk."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Kræver python-avahi."
 
-#: ../src/features_window.py:58
+#: ../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:59
-msgid "gajim-remote"
-msgstr "gajim-fjernstyring"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Kommandoer: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Et script til at kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Kræver python-dbus."
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 "Egenskab ikke tilgængelig under Windows."
 
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Krypter samtale beskeder med gpg nøgler."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Kræver gpg og python-GnuPGInterface."
 
-#: ../src/features_window.py:67
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Automatisk opdagelse af netværksstatus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Kræver gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Sessions Håndtering"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sessionen bliver gemt ved logud og genoprettet ved logind."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Kræver python-gnome2."
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "gnome-nøglering"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Adgangskode for at slutte sig til rummet"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Adgangskoder kan blive gemt sikkert og ikke bare i ren tekst."
 
-#: ../src/features_window.py:77
-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 og python-gnome2-desktop."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evnen til at tilslutte til servere som bruger SRV poster."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Kræver dnsutils."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Kræver nslookup for at bruge SRV poster."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Stavekontrol"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontrol af forfattede beskeder."
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Kræver python-gnome2-extras eller kompilering af gtkspell modulet fra Gajim "
-"kildekoden."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Kræver python-sexy."
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr "Påmindelses-dæmon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Påmindelser"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Passive pop op vinduer som påminder om nye hændelser."
 
-#: ../src/features_window.py:89
+#: ../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 forbindelse med påmindelses-dæmonen."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Statusikon"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Et ikon i statusfeltet som viser din nuværende tilstedeværelse."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Kræver python-gnome2-extras eller et kompileret statusikon modul fra Gajim "
 "kildekoden."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Kræver PyGTK >= 2.10."
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "Tomgang"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Tilpas til status"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til at måle tomgangs tid, for at kunne sætte automatisk status."
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Kræver kompilering af tomgangs modulet fra Gajim kildekoden."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
+msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Kræver python-gnome2."
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Omdan LaTeX udtryk mellem $$ $$."
 
-#: ../src/features_window.py:101
+#: ../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."
@@ -7216,7 +7491,7 @@ msgstr ""
 "Kræver texlive-latex-base og dvipng. Du må sætte 'use_latex' til True i den "
 "avancerede konfigurations editor."
 
-#: ../src/features_window.py:102
+#: ../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."
@@ -7224,23 +7499,25 @@ msgstr ""
 "Kræver texlive-latex-base og dvipng (begge findes i MikTeX). Du må sætte "
 "'use_latex' til True i den avancerede konfigurations editor."
 
-#: ../src/features_window.py:103
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Ende til Ende Kryptering"
 
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Krypterer samtale beskeder."
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Kræver python-crypto."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:108
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7248,25 +7525,25 @@ msgstr ""
 "Generer XHTML uddata fra RST kode (se http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Kræver python-docutils."
 
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Muligheden for at have trykbare URL'er i samtale og gruppe samtale vindues "
 "bannere."
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Kræver python-sexy."
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Egenskab"
 
@@ -7295,7 +7572,7 @@ msgstr "Størrelse: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Du"
 
@@ -7305,7 +7582,7 @@ msgid "Sender: %s"
 msgstr "Afsender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Modtager: "
 
@@ -7337,26 +7614,27 @@ msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Filoverførslen blev stoppet af kontakten i den anden ende"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Filoverførsel Stoppede"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Vælg en Fil at Sende..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan ikke tilgå denne fil"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Denne fil bliver brugt af en anden proces."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
@@ -7376,12 +7654,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vil gerne sende dig en fil:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive den eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
@@ -7389,22 +7667,22 @@ msgstr ""
 "En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Hvad vil du gøre?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../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 ikke rettigheder til at oprette filer i dette katalog."
 
@@ -7440,48 +7718,52 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig at sende tomme filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s er ikke et gyldigt logniveau"
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behøver en X server for at kunne køre. Slutter..."
 
-#: ../src/gajim.py:186
-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 højere"
 
-#: ../src/gajim.py:187
-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 højere for at køre. Slutter..."
 
-#: ../src/gajim.py:189
-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 højere"
 
-#: ../src/gajim.py:190
-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 højere for at køre. Slutter..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ udførselsmiljø mangler libglade understøttelse"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7490,22 +7772,22 @@ msgstr ""
 "Fjern venligst dit nuværende GTK+ udførselsmiljø og installer den sidste "
 "stabile version fra %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Hver venligst sikker på at GTK+ og PyGTK har libglade understøttelse på dit "
 "system."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behøver PySQLite2 for at køre"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behøver pywin32 for at køre"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7515,11 +7797,11 @@ msgstr ""
 "det fra %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim kører allerede"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7527,25 +7809,35 @@ msgstr ""
 "En anden instans af Gajim ser ud til at køre\n"
 "Kør alligevel?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Ingen GPG nøgle valgt"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7556,50 +7848,59 @@ msgstr ""
 "anden indehaver.\n"
 "Specificer venligst et andet kælenavn under:"
 
-#: ../src/gajim.py:571
+#: ../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 "Accepterer du denne forespørsel?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fejl %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Abonnement Forespørgsel"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkendt dig til at se hans eller hendes status."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: ../src/gajim.py:1010
+#: ../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?"
@@ -7607,73 +7908,78 @@ msgstr ""
 "Du vil altid se ham eller hende som offline.\n"
 "Vil du fjerne ham eller hende fra din kontakt liste?"
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Frameld abonnement"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nu kendt som %(new_nick)s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 er nu %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har sat emnet til %(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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En ændring i en non-privacy-related rum konfiguration har forekommet"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Rum logging er nu aktiveret"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Rum logging er nu deaktiveret"
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "En adgangskode er påkrævet for at deltage i rummet %s. Venligst skriv den."
 
-#: ../src/gajim.py:1459
+#: ../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"
@@ -7681,27 +7987,56 @@ msgstr ""
 "Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
 "agent som kører eller den returnerede en forkert gpg-løsen.\n"
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Dit pgp-løsen er ikke korrekt"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG er ikke brugbar"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
+"beskeder."
+
+#: ../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 "Ikke spørg mig ige_n"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomes Nøglering er installeret men ikke \t\t\t\t\t\t\t startet korrekt "
+"(miljøvariabel er sandsynligvis ikke \t\t\t\t\t\t\t sat op rigtig)"
+
+#: ../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:1566
+#: ../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-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7716,34 +8051,44 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Fjerner kontakt fra kontaktvinduet"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fejl ved læsning af fil:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har succesfuldt modtaget %(filename)s fra %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s fra %(name)s er stoppet."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har succesfuldt sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Filoverførsel af %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1827
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7752,36 +8097,36 @@ msgstr ""
 "Ikke i stand til at dekryptere beskeden fra %s\n"
 "Det er mulig den er blevet forfalsket."
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: ../src/gajim.py:1905
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: ../src/gajim.py:1906
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: ../src/gajim.py:1918
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1931
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s .s)"
 
-#: ../src/gajim.py:1942
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Fejl."
 
-#: ../src/gajim.py:1967
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: ../src/gajim.py:1968
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7789,11 +8134,11 @@ msgstr ""
 "Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
 "venligst en ny"
 
-#: ../src/gajim.py:2021
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: ../src/gajim.py:2022
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7804,19 +8149,19 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: ../src/gajim.py:2027
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: ../src/gajim.py:2042
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: ../src/gajim.py:2043
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7829,11 +8174,11 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: ../src/gajim.py:2066
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7841,16 +8186,11 @@ msgstr ""
 "Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
 "sikker på du vil gøre dette?"
 
-#: ../src/gajim.py:2068 ../src/gajim.py:2098
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: ../src/gajim.py:2069 ../src/gajim.py:2099 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "Ikke spørg mig ige_n"
-
-#: ../src/gajim.py:2096
+#: ../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?"
@@ -7859,21 +8199,21 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gajim.py:2113
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP knude blev ikke fjernet"
 
-#: ../src/gajim.py:2114
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2582 ../src/gajim.py:2603
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/gajim.py:2583
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7881,7 +8221,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: ../src/gajim.py:2604
+#: ../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 "
@@ -7891,56 +8231,38 @@ msgstr ""
 "opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2630 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke deltage i en gruppe samtale mens du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2910
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: ../src/gajim.py:3007
-msgid "Bookmark already set"
-msgstr "Bogmærke er allerede sat"
-
-#: ../src/gajim.py:3008
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
-
-#: ../src/gajim.py:3021
-msgid "Bookmark has been added successfully"
-msgstr "Bogmærket er blevet tilføjet succesfuldt"
-
-#: ../src/gajim.py:3022
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"De kan håndtere dine bogmærker via Handlings menuen i dit kontaktvindue."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Viser hjælp for en specifik kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "Kommando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "Vis hjælp for kommando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Viser eller gemmer kontaktvinduet"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Popper op et vindue ved næste hændelse"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7948,47 +8270,48 @@ msgstr ""
 "Udskriver en liste af alle kontakter i kontaktvinduet. Hver kontakt placeres "
 "på en separat linie"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "Konto"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "viser kun kontakter for den givne konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Udskriver en liste af registrerede kontoer"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ændrer status for kontoen eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "besked"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status besked"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -7997,20 +8320,24 @@ msgstr ""
 "status for alle kontoer der har sat \"synkroniser med generel status\" "
 "indstillingen"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende beskeder til en kontakt"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "Kontaktens JID som du vil samtale med"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "hvis specificeret vil kontakten tages fra kontaktlisten fra denne konto"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8020,29 +8347,29 @@ msgstr ""
 "konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP nøgle', "
 "bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID på den kontakt som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "besked indhold"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp nøgle"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hvis specificeret vil beskeden blive krypteret med denne nøgle"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "hvis specificeret vil beskeden blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8052,139 +8379,139 @@ msgstr ""
 "nøgle og konto er valgfri. Hvis du ønsker at sætte en 'konto' uden 'OpenPGP "
 "nøgle', bare set 'OpenPGP nøgle' til ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "emne"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "emne på besked"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Send en ny besked til en gruppesamtale du deltager i."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID på den rum som skal modtage beskeden"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Få detaljeret information om kontakten"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "Kontaktens JID"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Få detaljeret information om kontoen"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Send en fil til en kontakt"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Filsti"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "hvis specificeret vil filen blive sendt med denne konto"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Hvis alle indstillinger og deres værdier"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sætter værdien for 'nøglen' til 'værdi'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "nøgle=værdi"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'nøgle' er navnet for indstillingen, 'værdi' er den værdi den er sat til"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Sletter et indstillingspunkt"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "nøgle"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "navn på den indstilling som skal slettes"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Skriver den nuværende tilstand af Gajims indstillinger til .config filen"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Tilføjer kontakt til kontaktvinduet"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Tilføjer ny kontakt til denne konto"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende status (den globale status hvis ikke en konto er "
 "valgt)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnere den nuværende statusbesked (den globale status besked hvis ikke en "
 "konto er valgt)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Returnerer antal ikke læste beskeder"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åbner 'Start Samtale' vinduet"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Starter en samtale med denne konto"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Sender tilpasset XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML som skal sendes"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8192,67 +8519,72 @@ msgstr ""
 "Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
 "blive sendt til alle kontoer"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndter en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI som skal håndteres"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Den konto som du vil håndtere det med"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "besked indhold"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Rum JID"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Kælenavn som skal bruges"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Adgangskode for at slutte sig til rummet"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Vælg den konto som du vil slutte dig til rummet med"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8261,15 +8593,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ud til at Gajim ikke kører. Så du kan ikke bruge gajim-remote."
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8278,16 +8610,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8296,7 +8628,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8305,7 +8637,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8314,7 +8646,7 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Forkert uri"
 
@@ -8331,178 +8663,180 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Opret et nyt tema med dit ønskede navn."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "Tema navn"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette det nuværende tema"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Vælg venligst en anden for dit nuværende tema."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke længere i gruppe samtale \"%(room)s\" eller \"%(nick)s\" har "
 "forladt rummet."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr "Virkelig send denne fil?"
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Hvis du sender en fil til %s, vil han eller hun få at vide dit rigtige "
-"Jabber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har fastsat eller ændret dit kælenavn for rummet"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet udvist af %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s er blevet uønsket af %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../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 er blevet fjernet fra rummet %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s af %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilhørsforholdet for %(nick)s er blevet sat til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s af %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s rolle er blevet sat til %(role)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-msgid "Invalid nickname"
-msgstr "Ugyldigt kælenavn"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kælenavn ikke fundet: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Denne gruppe samtale har ikke noget emne"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Inviterede %(contact_jid)s til %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Kælenavn ikke fundet: %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 ""
 "Brug: /%s <kælenavn|JID> [begrundelse], udviser denne JID fra gruppe "
 "samtalen. Kælenavnet til en bruger kan bruges, men ikke hvis det indeholder "
 "\"@\". Hvis en bruger med JID'en er tilstede i gruppe samtalen vil han/hun/"
 "den/det også blive udvist. Mellemrum i kælenavnet er ikke understøttet."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8511,7 +8845,7 @@ msgstr ""
 "Brug: /%s <kælenavn>, åbner et privat samtale vindue med den specificerede "
 "bruger."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8520,7 +8854,7 @@ msgstr ""
 "Brug: /%s [begrundelse], lukker det nuværende vindue eller fan, visende "
 "begrundelsen hvis specificeret."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8529,7 +8863,7 @@ msgstr ""
 "Brug: /%s <JID> [begrundelse], inviter JID til den nuværende gruppe samtale, "
 "visende begrundelsen hvis specificeret"
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8538,17 +8872,16 @@ msgstr ""
 "Brug: /%s <rum>@<server>[/kælenavn], tilbyder at deltage i rum@server "
 "eventuelt med det specificerede kælenavn."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Brug: /%s <kælenavn> [begrundelse], fjerner deltager med kælenavnet fra "
 "gruppe samtalen og hvis specificeret, viser en begrundelse"
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8557,64 +8890,79 @@ msgstr ""
 "Brug: /%s <kælenavn> [besked], åbner et privat samtale vindue og sender "
 "beskeden til deltageren med det specificerede kælenavn."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Brug: /%s , viser navnene på deltagerne i gruppe samtalen."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Brug: /%s [emne], viser eller opdaterer det nuværende gruppe samtale emne."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Brug: /%s <besked>, sender en besked uden at kigge efter andre kommandoer."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 ""
+"Brug: /%s <kælenavn>, ændrer dit kælenavn i den nuværende gruppe samtale."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på du vil forlade gruppe samtalen \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Hvis du lukker dette vindue vil du blive frakoblet fra denne gruppe samtale."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Anfør dit nye kælenavn:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8622,22 +8970,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -8667,82 +9015,82 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Fejl ved læsning af fil:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Fejl ved fortolkning af 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 ""
 "Kunne ikke skrive til %s. Sessions håndterings understøttelse vil ikke virke"
 
 #. 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 er ikke standard Jabber client"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Har du lyst til at gøre Gajim til standard Jabber client?"
 
-#: ../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 "Altid kontroller om Gajim er standard Jabber client ved opstart"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: ../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 "Billede kan ikke gemmes i formatet %(type)s. Gem som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Gem Billede som..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Kælenavn"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Besked"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Vil du rydde op i databasen? (DETTE ER IKKE ANBEFALET HVIS GAJIM KØRER)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8756,171 +9104,182 @@ msgstr ""
 "\n"
 "I tilfælde du trykker JA, venligst vent..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Eksporter Historik Log..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s klokken %(time)s sagde: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Vil du virkelig slette loggen for den valgte kontakt?"
 msgstr[1] "Vil du virkelig slette loggene fra de valgte kontakter?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Dette er en irreversibel handling."
 
-#: ../src/history_manager.py:585
+#: ../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] "Vil du virkelig slette den valgte besked?"
 msgstr[1] "Vil du virkelig slette de valgte beskeder?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Konversations Historik med %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr "Disk Skrivefejl"
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Du er ikke tilsluttet til serveren"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Vil du virkelig slette den valgte besked?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Beskeder"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr "- beskeder vil blive logget"
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr "- beskeder vil ikke blive logget"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Besked fra gruppe samtale %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 "Besked fra %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Fællesbetegnelse"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignorer"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Information modtaget"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uden en tilslutning kan du ikke publicere din kontakt information."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Sender profil..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Information er IKKE publiceret"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "vCard publicering fejlede"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -8928,56 +9287,48 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Hvis %s accepterer denne forespørsel vil du kunne se hans eller hendes "
 "status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnomes Nøglering er installeret men ikke \t\t\t\t\t\t\t startet korrekt "
-"(miljøvariabel er sandsynligvis ikke \t\t\t\t\t\t\t sat op rigtig)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -8985,15 +9336,28 @@ msgstr ""
 "Hvis du ændrer din status til usynlig vil det resultere i at du bliver "
 "frakoblet fra disse gruppesamtaler. Er du sikker på du vil gøre dig usynlig?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Er du sikker på du vil forlade gruppe samtalen \"%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 ulæste beskeder"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9001,16 +9365,16 @@ msgstr ""
 "Beskeder vil kun være tilgængelige for læsning senere hvis du har historik "
 "aktiveret og kontakten er i dit kontaktvindue."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Du må læse dem før du fjerner denne transport."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9018,11 +9382,11 @@ msgstr ""
 "Du vil ikke længere være i stand til at sende og modtage beskeder fra "
 "kontakter som bruger denne transport."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9032,51 +9396,56 @@ msgstr ""
 "kontakter som bruger disse transporter: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vil du fjerne gruppen %s fra kontaktvinduet?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Fjern også alle kontakter i denne gruppe fra kontaktvinduet"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9085,11 +9454,11 @@ msgstr ""
 "vil altid se dig som offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9097,16 +9466,16 @@ msgstr ""
 "Ved at fjerne denne kontakt fjerner du også samtidig godkendelsen, så han "
 "eller hun altid vil se dig som offline."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Jeg vil at denne kontakt kan se min status efter den er blevet fjernet"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9116,20 +9485,20 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Du må oprette en konto før du kan begynde en samtale med andre kontakter."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9138,12 +9507,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Du er ved at oprette en metakontakt. Er du sikker på du vil fortsætte?"
 
-#: ../src/roster_window.py:3786
+#: ../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 "
@@ -9152,139 +9521,141 @@ msgstr ""
 "Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
 "bruges det når den samme person har flere Jabber eller transport kontoer."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:3910
+#: ../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] "Vil du sende denne fil til %s:"
 msgstr[1] "Vil du sende disse filer til %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Send %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Send en fil til en kontakt"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:4872
-msgid "Mood"
-msgstr "Humør"
-
-#: ../src/roster_window.py:4876
-msgid "Activity"
-msgstr "Aktivitet"
-
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
@@ -9301,20 +9672,20 @@ msgstr "Fejl i modtaget dataform"
 msgid "No result"
 msgstr "Intet resultat"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Disk SkriveFejl"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Emne: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9329,7 +9700,7 @@ msgstr ""
 "\n"
 "\tKan disse indstillinger godkendes?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9344,124 +9715,116 @@ msgstr ""
 "\n"
 "Fortsæt med sessionen?"
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Ændre Status Besked..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
-#: ../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 "Ressource: "
 
-#: ../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 af denne gruppe samtale"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blokeret]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimeret]"
 
-#: ../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 "Sidste status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abonnering: "
 
-#: ../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 "Melodi:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Hent"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Send"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Fuldført"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Midlertidig stoppet"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Hænger"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret 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"
@@ -9477,16 +9840,21 @@ msgstr "?Client:Ukendt"
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Client:Ukendt"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9494,7 +9862,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9502,14 +9870,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er begge interessered i hinandens tilstedeværelses "
 "information"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9517,14 +9885,104 @@ msgstr ""
 "Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
 "interesseret i din"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar om din abonnements forespørsel"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " ressource med prioritet "
+
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Tryk for at se egenskaber (som MSN, ICQ transporter) på jabber serveren"
+
+#~ msgid "Servers Features"
+#~ msgstr "Server Egenskaber"
+
+#~ msgid "Your JID:"
+#~ msgstr "Din JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Værtsmaskine:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Vis _kontaktvindue"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Vælg den konto som du vil synkronisere med"
+
+#~ msgid "Modify Account"
+#~ msgstr "Ændre Konto"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s af %(artist)s\n"
+#~ "fra %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim konto %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Altid brug OS/X standard programmer"
+
+#~ msgid "Custom"
+#~ msgstr "Tilpasset"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Jabber ID eksisterer"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Denne konto er allerede konfigureret i Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-fjernstyring"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-nøglering"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Kræver python-gnome2-extras eller kompilering af gtkspell modulet fra "
+#~ "Gajim kildekoden."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Påmindelses-dæmon"
+
+#~ msgid "Idle"
+#~ msgstr "Tomgang"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Kræver kompilering af tomgangs modulet fra Gajim kildekoden."
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Filoverførslen blev stoppet af kontakten i den anden ende"
+
+#~ msgid "Generic"
+#~ msgstr "Fællesbetegnelse"
+
+#~ msgid "Mood"
+#~ msgstr "Humør"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivitet"
diff --git a/po/de.po b/po/de.po
index 2b27e614d..d8a64ccd6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,17 +7,12 @@
 # Sebastian Schäfer <sarek@uliweb.de>, 2007.
 # Nico Gulden <cilugnedon@gmx.de>, 2007, 2008, 2009.
 # Niklas Hambüchen <nh2@deditus.de>, 2009.
-#. app_name (string)
-#. replaces_id (uint)
-#. event_id (string)
-#. app_icon (string)
-#: ../src/notify.py:560
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-06 23:03+0200\n"
-"PO-Revision-Date: 2009-02-14 19:58+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:38+0200\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
 "MIME-Version: 1.0\n"
@@ -113,52 +108,57 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Authentifizierung _verwenden"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Verbinden, sobald ich auf Fertig klicke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Assistent zum Einrichten eines neuen Kontos"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Ich habe bereits ein Konto, das ich ben_utzen möchte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../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 "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Verwalten …"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Pass_wort speichern"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Mein Profil setzen, wenn ich mich verbinde"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../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."
@@ -166,36 +166,36 @@ msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
 "verbinden können."
 
-#: ../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 "_Erweitert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Rec_hnername:"
 
-#: ../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:57
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../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 "_Passwort:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
@@ -207,13 +207,11 @@ msgstr "<b>Verschiedenes</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persönliche Informationen</b>"
 
@@ -232,18 +230,17 @@ msgid "Administration operations"
 msgstr "Administrative Aktionen"
 
 #: ../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 "Automatisch neu verbinden, falls die Verbindung abbricht"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:10
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
 #: ../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 "Pass_wort ändern"
 
@@ -260,24 +257,23 @@ msgstr ""
 "standardmäßig verwendet, wenn der Server sie unterstützt."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:13
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen …"
 
 #: ../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 "Klicken, um das Konto-Passwort zu ändern."
 
 #: ../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 ""
 "Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
 
 #: ../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 "Verbindung"
 
@@ -287,10 +283,10 @@ msgstr "Persönliche Informationen bearbeiten …"
 
 #. 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:1143
-#: ../src/common/helpers.py:1155 ../src/notify.py:556 ../src/notify.py:577
-#: ../src/notify.py:616 ../src/notify.py:628
+#: ../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"
 
@@ -298,11 +294,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/preferences_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/roster_window.py:2644 ../src/roster_window.py:5195
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Allgemein"
 
@@ -311,7 +306,7 @@ msgid "Hostname: "
 msgstr "Server-Name: "
 
 #: ../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."
@@ -321,7 +316,7 @@ msgstr ""
 "erhöht wird."
 
 #: ../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"
@@ -330,7 +325,6 @@ msgstr ""
 "Verbindungsabbruch durch eine Zeitüberschreitung zu verhindern."
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -339,8 +333,7 @@ msgstr ""
 "für Sie in ~/.gajim/config speichern."
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:26
-#: ../data/glade/zeroconf_properties_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -349,8 +342,7 @@ msgstr ""
 "mit diesem Konto."
 
 #: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:10
+#: ../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 "
@@ -361,14 +353,13 @@ msgstr ""
 "entsprechend geändert."
 
 #: ../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 "Informationen über Sie, die auf dem Server gespeichert sind"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1570
-#: ../src/config.py:2073
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
@@ -378,20 +369,20 @@ msgstr "Kein Schlüssel ausgewählt"
 #. 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:1118
-#: ../src/config.py:1207 ../src/config.py:1475 ../src/config.py:1480
-#: ../src/config.py:1981 ../src/config.py:2059 ../src/config.py:2072
-#: ../src/config.py:3161 ../src/config.py:3229 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:523 ../src/roster_window.py:2714
-#: ../src/roster_window.py:2720 ../src/roster_window.py:2725
+#: ../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 "Kein Proxy"
 
 #: ../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
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
@@ -400,12 +391,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_tät:"
 
 #: ../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 "
@@ -416,7 +407,7 @@ msgstr ""
 "verbunden sind. Der Client mit der höchsten Priorität wird ausgewählt."
 
 #: ../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 ""
 "Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
@@ -426,12 +417,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../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 "Ressour_ce:"
 
 #: ../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 "
@@ -446,13 +437,11 @@ msgstr ""
 "Ressource mit der höchsten Priorität (siehe unten) erhält die Nachrichten."
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "_Passphrase speichern (unsicher)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:44
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern"
 
@@ -461,13 +450,12 @@ msgid "Send keep-alive packets"
 msgstr "Keepalive-Pakete senden"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Konto-Status mit globalem Status synch_ronisieren"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Kontakte synchronisieren"
@@ -477,7 +465,7 @@ msgid "Use _SSL (legacy)"
 msgstr "_SSL verwenden (veraltet)"
 
 #: ../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 "Dateiübertragungs-Proxys verwenden"
 
@@ -486,7 +474,7 @@ msgid "_Adjust to status"
 msgstr "Mit Status _abgleichen"
 
 #: ../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 "_Name:"
 
@@ -502,7 +490,12 @@ msgstr "Mit Status _abgleichen"
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Authentifizierung _verwenden"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -510,31 +503,28 @@ msgstr ""
 "Falls aktiviert, fragt Gajim nach, bevor das Passwort über eine unsichere "
 "Verbindung gesendet wird."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
 msgstr "Beim _Programmstart verbinden"
 
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Vorname:"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../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 ""
 "Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
 "seahorse."
 
-#: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:11
+#: ../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"
@@ -545,85 +535,85 @@ msgstr ""
 "festlegen.\n"
 "Eventuell müssen Sie dazu Ihre Firewall-Einstellungen ändern."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:680
+#: ../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
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Nachname:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Konten _zusammenführen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5146
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Send _keep-alive packets"
 msgstr "_Keepalive-Pakete senden"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Synchroni_ze account status with global status"
 msgstr "Konto-Status mit globalem Status synchroni_sieren"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 msgid "Use G_PG Agent"
 msgstr "G_PG Schlüsselverwaltung verwenden"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use cust_om hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use cust_om port:"
 msgstr "Benutzerdefinierten P_ort verwenden:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 msgid "_Edit Personal Information..."
 msgstr "Persönliche Informationen b_earbeiten …"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Enable"
 msgstr "Aktivi_eren"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Hostname: "
 msgstr "Rec_hnername: "
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Manage..."
 msgstr "_Verwalten …"
 
-#: ../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 "_Warnen, bevor eine unsichere Verbindung verwendet wird"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 msgid "_use HTTP__PROXY environment variable"
 msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -813,7 +803,7 @@ msgid "All statuses"
 msgstr "Alle Status"
 
 #: ../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 "Abwesend"
 
@@ -830,7 +820,7 @@ msgid "Have "
 msgstr "habe "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Unsichtbar"
 
@@ -839,7 +829,7 @@ msgid "Launch a command"
 msgstr "Einen Befehl ausführen"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -960,7 +950,7 @@ msgstr "Zuletzt geändert:"
 msgid "New entry received"
 msgstr "Neuer Eintrag empfangen"
 
-#: ../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 "Sie haben einen neuen Eintrag erhalten:"
 
@@ -1004,11 +994,19 @@ msgstr "Neues Passwort eingeben:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Geben Sie Ihre neue Statusnachricht ein</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 "Aktivität:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Stimmung:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Voreingestellte Nachrichten:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Als Voreinstellung speichern …"
 
@@ -1069,11 +1067,11 @@ msgstr "Zur Kont_aktliste hinzufügen"
 
 #: ../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:5842
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Verlauf"
 
@@ -1186,7 +1184,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -1222,7 +1220,7 @@ msgstr ""
 "Kontakt-Reihe\n"
 "Chat-Banner"
 
-#: ../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 "Fett"
 
@@ -1242,11 +1240,11 @@ msgstr "Gajim-Design-Einstellungen"
 msgid "Gone"
 msgstr "Weg"
 
-#: ../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"
 
@@ -1294,7 +1292,7 @@ msgstr "_Design ändern …"
 msgid "Configure _Room..."
 msgstr "Chat_raum einrichten …"
 
-#: ../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 "Chatraum zu den Lesezeichen _hinzufügen"
 
@@ -1326,23 +1324,38 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../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 "_Blockieren"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Mitglied"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Besitzer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "Private Nachricht _senden"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
+# TODO: Review by german translators
+#: ../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 "_Entblocken"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
@@ -1350,13 +1363,13 @@ msgstr "_Stimme verleihen"
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../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 "Von"
 
 #. 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 "Thema"
 
@@ -1375,7 +1388,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</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 "Löschen"
 
@@ -1429,7 +1443,7 @@ msgstr "Suchen:"
 msgid "_Log conversation history"
 msgstr "Unterhaltungsver_lauf"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1702
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
@@ -1456,8 +1470,8 @@ msgstr "Kürzlich:"
 msgid "Room:"
 msgstr "Chatraum:"
 
-#: ../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 "_Betreten"
 
@@ -1485,7 +1499,7 @@ msgstr "Minimieren bei automatischem Beitritt"
 msgid "Print status:"
 msgstr "Status anzeigen:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1514,10 +1528,6 @@ msgid "<b>Settings</b>"
 msgstr "<b>Einstellungen</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"
@@ -1527,39 +1537,39 @@ 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 "Proxy-Verwaltung"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Proxy _Host:"
 msgstr "Proxy-A_dresse:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Port:"
 msgstr "Proxy-_Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr "HTTP-Prox_y verwenden"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "Use proxy auth_entication"
 msgstr "Authentifizierung _verwenden"
 
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH-Adresse:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:14
 msgid "_Type:"
 msgstr "_Art:"
 
-#: ../data/glade/manage_proxies_window.glade.h:16
+#: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Benutzername:"
 
@@ -1611,7 +1621,7 @@ msgstr "Benutzerprofil anzeigen (Strg+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 "_Senden"
 
@@ -2032,7 +2042,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../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"
 
@@ -2219,7 +2229,7 @@ msgstr "der Jabber-ID:"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2576
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
@@ -2364,7 +2374,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Namenspräfix:</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>Rolle:</b>"
 
@@ -2424,8 +2434,8 @@ msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5183
-#: ../src/roster_window.py:5661 ../src/roster_window.py:5790
+#: ../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 "_Entfernen"
 
@@ -2448,14 +2458,14 @@ msgstr "_Gruppen bearbeiten …"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5733
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Befehl ausführen …"
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5101 ../src/roster_window.py:5614
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
@@ -2465,7 +2475,7 @@ msgstr "Ent_fernen"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5111 ../src/roster_window.py:5699
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
@@ -2490,12 +2500,6 @@ msgstr "_Chat starten"
 msgid "_Allow him/her to see my status"
 msgstr "Erlaube dem Kont_akt, meinen Status zu sehen"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5174 ../src/roster_window.py:5651
-#: ../src/roster_window.py:5780
-msgid "_Block"
-msgstr "_Blockieren"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
@@ -2517,17 +2521,34 @@ msgstr "_Umbenennen …"
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-# TODO: Review by german translators
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5168 ../src/roster_window.py:5645
-#: ../src/roster_window.py:5777
-msgid "_Unblock"
-msgstr "_Entblocken"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "Ignorieren a_ufheben"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Kontakt hinzufügen …"
@@ -2565,7 +2586,8 @@ msgid "Show _Offline Contacts"
 msgstr "Abgemeldete K_ontakte anzeigen"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "_Kontaktliste anzeigen"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2582,7 +2604,7 @@ msgstr "_Aktionen"
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../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 "Änd_ern"
 
@@ -2623,11 +2645,11 @@ msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5802
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Informationen"
 
-#: ../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 "_Suche"
 
@@ -2739,10 +2761,6 @@ msgstr "Einzelne Nachricht _senden"
 msgid "Show All Pending _Events"
 msgstr "Zeige alle neuen _Ereignisse"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "_Kontaktliste anzeigen"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2852,13 +2870,13 @@ msgstr "Open_PGP-Schlüssel zuweisen"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5634
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5760
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Umbenennen"
 
@@ -2882,34 +2900,26 @@ msgstr "Ressource:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Konto bearbeiten"
-
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use _custom port:"
-msgstr "Verwende _benutzerdefinierten Port:"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Bestätigung abbrechen"
 
-#: ../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 ""
 "Sie sind dabei, einen Befehl auszuführen. Wollen Sie wirklich abbrechen?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Der Dienst änderte die Sitzungskennung."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Der Dienst sendete unzureichende Daten."
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Der Dienst änderte die Sitzungskennung."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
@@ -2934,7 +2944,7 @@ msgstr "Ganzzahl"
 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 "Farbe"
 
@@ -2959,172 +2969,197 @@ msgstr "(Keine)"
 msgid "Hidden"
 msgstr "Versteckt"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Sie haben einen neuen Eintrag erhalten:"
+
 #. 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 "Englisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretonisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Britisch"
 
-#: ../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 "Spanisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norwegisch (Bokmål)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brasilianisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russsich"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovakisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:345
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. 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 "Keine Verbindung verfügbar"
 
-#: ../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 "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/chat_control.py:751
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:752
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:775
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:784
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Datei wirklich senden?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Wenn Sie eine Datei an %s senden, wird der Kontakt Ihre echte Jabber-ID "
+"kennen."
+
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1220 ../src/chat_control.py:1624
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1250 ../src/chat_control.py:2126
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:862
-#: ../src/dialogs.py:905 ../src/dialogs.py:1653 ../src/gajim.py:988
-#: ../src/gajim.py:1721 ../src/roster_window.py:910
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:1889 ../src/roster_window.py:3084
-#: ../src/roster_window.py:3110 ../src/roster_window.py:5295
-#: ../src/roster_window.py:5480
+#: ../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 "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1383 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Eine Liste der aktiven, fertigen und angehaltenen Dateiübertragungen"
+
+#: ../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 "Unbekannter Künstler"
 
-#: ../src/chat_control.py:1385 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: ../src/chat_control.py:1387 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: ../src/chat_control.py:1391 ../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"
@@ -3133,28 +3168,19 @@ msgstr ""
 "<b>\"%(title)s\"</b> von <i>%(artist)s</i>\n"
 "aus <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1396
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s von %(artist)s\n"
-"aus %(source)s"
-
-#: ../src/chat_control.py:1519
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s aus dem Chatraum %(room_name)s"
 
 # TODO: GPG/PGP unification in original strings needed
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1604 ../src/dialogs.py:3918
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1605
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3163,50 +3189,50 @@ msgstr ""
 "GPG verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1614
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1640
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:1656
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1658
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:1658
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1662
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "und NICHT authentifiziert"
 
 #. 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:1672
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3215,26 +3241,26 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Der Befehl für das Zeroconf-Konto wird nicht unterstützt."
 
-#: ../src/chat_control.py:1731 ../src/groupchat_control.py:1657
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Befehle: %s"
 
-#: ../src/chat_control.py:1734 ../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 "Verwendung: /%s, leert das Textfenster."
 
-#: ../src/chat_control.py:1737 ../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 "Verwendung: /%s, versteckt die Chatschaltflächen."
 
-#: ../src/chat_control.py:1740 ../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 "
@@ -3244,38 +3270,38 @@ msgstr ""
 "Chatraum. Verwenden Sie die Person Singular, z.B. mit /%(command)s kratzt "
 "sich am Kinn)."
 
-#: ../src/chat_control.py:1745
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Verwendung: /%s, sendet einen Ping zum Kontakt."
 
-#: ../src/chat_control.py:1748
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Verwendung: /%s, sendet eine Nachricht zum Kontakt."
 
-#: ../src/chat_control.py:1751 ../src/groupchat_control.py:1715
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s."
 
-#: ../src/chat_control.py:1884
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:1891
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:1894
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1896
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3283,25 +3309,25 @@ msgstr ""
 "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
 "Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:1903
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1937 ../src/chat_control.py:1950
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:1943
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Die folgende Nachricht wurde verschlüsselt übertragen"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2314
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2315
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3309,15 +3335,15 @@ msgstr ""
 "Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
 "Nachricht verloren."
 
-#: ../src/chat_control.py:2463 ../src/common/connection_handlers.py:1964
-#: ../src/common/connection_handlers.py:2010
-#: ../src/common/connection_handlers.py:2198
-#: ../src/common/connection_handlers.py:2331 ../src/common/connection.py:1344
-#: ../src/gajim.py:158
+#: ../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 "Datenbankfehler"
 
-#: ../src/chat_control.py:2464
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3326,7 +3352,7 @@ msgstr ""
 "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
 "reparieren oder zu löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/chat_control.py:2700
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
@@ -3335,23 +3361,23 @@ msgstr "%(name)s ist jetzt %(status)s"
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../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 ist eine Datei, sollte aber ein Verzeichnis sein"
 
-#: ../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 wird nun beendet"
 
-#: ../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 ist ein Verzeichnis, sollte aber eine Datei sein"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
@@ -3415,9 +3441,9 @@ msgstr "Wählen Sie die Chaträume, die Sie verlassen möchten"
 
 #. 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:5071
+#: ../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 "Gruppenchat"
 
@@ -3433,57 +3459,57 @@ msgstr "Ungelesene Nachrichten weiterleiten"
 msgid "All unread messages have been forwarded."
 msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr ""
 "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum "
 "Chatten sind."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Zeit in Minuten, nach der Ihr Status auf Abwesend gesetzt wird"
 
-#: ../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 (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
 "Abwesenheitszeit."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Zeit in Minuten, nach der Ihr Status auf nicht verfügbar gesetzt wird."
 
-#: ../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 (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
 "Verfügbar-Zeit."
 
 # FIXME: Check English
-#: ../src/common/config.py:102
+#: ../src/common/config.py:89
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: "
 "'never', 'on_event', 'always'."
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3491,21 +3517,21 @@ msgstr ""
 "eingeklappt sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:113 ../src/common/config.py:465
-#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
-#: ../src/common/optparser.py:473 ../src/gajim.py:3262
+#: ../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 "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Sprache der Rechtschreibprüfung"
 
-#: ../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"
@@ -3515,7 +3541,7 @@ msgstr ""
 "'sometimes' - Zeige Zeit alle print_ichat_every_foo_minutes Minuten.\n"
 "'never' - Zeige nie die Zeit."
 
-#: ../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. "
@@ -3526,18 +3552,18 @@ msgstr ""
 "ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
 "'sometimes' gesetzt ist."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
-#: ../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 ""
 "Falls aktiviert, wird */_ nicht entfernt. So wird *abc* fett gedruckt, aber "
 "* * wird nicht entfernt."
 
-#: ../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/"
@@ -3548,7 +3574,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
 "dieses Feature benutzen möchten, installieren Sie docutils.)"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3556,7 +3582,7 @@ msgstr ""
 "Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
 "Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
 
-#: ../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."
@@ -3564,7 +3590,7 @@ msgstr ""
 "Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
 "Chatraum bereits vergeben ist."
 
-#: ../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 "
@@ -3575,19 +3601,19 @@ msgstr ""
 "Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
 "unter http://docs.python.org/lib/module-time.html (Englisch)."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Zeichen, die vor dem Spitznamen ausgegeben werden"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Zeichen, die nach dem Spitznamen gedruckt werden"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
 
-#: ../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."
@@ -3595,12 +3621,12 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
 "Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
-#: ../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)."
@@ -3608,11 +3634,11 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Standardeinstellung im ICQ-Client Mirabilis)."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
-#: ../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' "
@@ -3621,13 +3647,13 @@ msgstr ""
 "Entweder eine spezielle URL mit %s, wobei %s das Wort / die Phrase ist oder "
 "'WIKTIONARY', was bedeutet, dass das Wörterbuch Wiktionary verwendet wird."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
 "werden."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3639,14 +3665,14 @@ msgstr ""
 "(vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt "
 "und Ihre Konten synchronisieren sich mit dem globalen 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 ""
 "Senden von Chatstatus-Benachrichtigungen. Kann auf \"all\", \"composing_only"
 "\" oder \"disabled\" gesetzt werden."
 
-#: ../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."
@@ -3654,7 +3680,7 @@ msgstr ""
 "Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", "
 "\"composing_only\" oder \"disabled\" gesetzt werden."
 
-#: ../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."
@@ -3662,11 +3688,11 @@ msgstr ""
 "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll "
 "(print_time==sometimes), wird sie alle x Minuten angezeigt."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3674,7 +3700,7 @@ msgstr ""
 "Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
 "Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3682,7 +3708,13 @@ msgstr ""
 "Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von "
 "Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
 
-#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3691,27 +3723,27 @@ msgstr ""
 "Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
 "gesendet werden."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Der IEC-Standard legt fest: 1 KiB = 1024 Byte, 1 kB = 1000 Byte."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Neue Ereignisse per Trayicon anzeigen"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Tableiste bei nur einer Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Tab-Grenze im Chatfenster anzeigen?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
-#: ../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 "
@@ -3724,18 +3756,18 @@ msgstr ""
 "Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung "
 "mehr Rechenzeit."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Eine durch Semikola getrennte Liste von Worten, die in einem Chatraum "
 "hervorgehoben werden sollen."
 
-#: ../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."
@@ -3744,14 +3776,14 @@ msgstr ""
 "geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
 "wird."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Falls aktiviert, wird beim Starten überprüft, ob Gajim der Standard-Jabber-"
 "Client ist."
 
-#: ../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."
@@ -3759,7 +3791,7 @@ msgstr ""
 "Falls aktiviert, wird auf jedem Tab, der ungelesene Nachrichten enthält, ein "
 "Icon angezeigt. Abhängig vom Chat-Design kann dieses Icon auch animiert sein."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3767,13 +3799,13 @@ msgstr ""
 "Falls aktiviert, wird in der Kontaktliste unter dem Namen eines jeden "
 "Kontaktes dessen Statusnachricht angezeigt, sofern diese nicht leer ist."
 
-#: ../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 ""
 "Legt die Position des Avatars in der Kontaktliste fest. \"left\" (links) "
 "oder \"right\" (rechts) sind mögliche Optionen."
 
-#: ../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."
@@ -3781,7 +3813,7 @@ msgstr ""
 "Falls aktiviert, wird jeder Kontakt, der beim letzten Mal keinen Avatar "
 "hatte oder dessen gespeicherter Avatar zu alt ist, nach einem neuen gefragt."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3789,7 +3821,7 @@ msgstr ""
 "Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
 "Kontakt seinen Status oder seine Statusnachricht ändert."
 
-#: ../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 "
@@ -3803,30 +3835,30 @@ msgstr ""
 "Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
 "angezeigt, wenn jemand den Chatraum betritt oder verlässt."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade angemeldet haben."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
 
-#: ../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 ""
 "Falls aktiviert, werden wiederhergestellte Nachrichten mit einer etwas "
 "kleineren Schrift als normal dargestellt."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selbst an."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
-#: ../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 "
@@ -3836,7 +3868,7 @@ msgstr ""
 "Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt "
 "GTK+ und PyGTK >= Version 2.8)."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3847,7 +3879,7 @@ msgstr ""
 "Informationen gesendet."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3869,32 +3901,32 @@ msgstr ""
 "einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem "
 "Neustart von Gajim in Kraft."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Falls aktiviert, schließt die Escape-Taste aktive Tabs und Fenster."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Versteckt die Schaltflächen im Chatraum-Fenster."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Chatraum-Fenster."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
 
-#: ../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."
@@ -3902,17 +3934,17 @@ msgstr ""
 "Der Spitzname wird im Chat nur dann vor einer Nachricht angezeigt, wenn sie "
 "nicht von der Person stammt, die schon die letzte Nachricht geschrieben hat."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
 "verwendet wird."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3920,13 +3952,13 @@ msgstr ""
 "Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
 "werden sollen (Werte getrennt durch \":\")."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Strg+Tab, um zum nächsten Tab zu wechseln, wenn kein anderer Tab ungelesene "
 "Nachrichten enthält."
 
-#: ../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."
@@ -3934,7 +3966,7 @@ msgstr ""
 "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
 "werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
-#: ../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 "
@@ -3944,7 +3976,7 @@ msgstr ""
 "Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
 "sind ehalten Sie keine Nachrichten mehr vom Server."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3952,7 +3984,16 @@ msgstr ""
 "Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
 "um die Passwörter der Konten zu speichern."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
+"um die Passwörter der Konten zu speichern."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3960,7 +4001,7 @@ msgstr ""
 "Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
 "den Konto- und Gruppenreihen angezeigt."
 
-#: ../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"
@@ -3968,7 +4009,7 @@ msgstr ""
 "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, werden alle "
 "eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ."
 
-#: ../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."
@@ -3977,7 +4018,7 @@ msgstr ""
 "auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
 "nicht bereits geöffnet ist."
 
-#: ../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."
@@ -3985,12 +4026,12 @@ msgstr ""
 "Falls aktiviert, wird Gajim eine Zeichenkette zwischen $$ und $$ mittels "
 "dvips vor dem Einfügen in ein Chatfenster in ein Bild umwandeln."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3998,7 +4039,7 @@ msgstr ""
 "Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
 "Zeilen werden gelöscht."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4006,11 +4047,11 @@ msgstr ""
 "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
 "an das Systray-Icon angehängt."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
 
-#: ../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."
@@ -4018,7 +4059,7 @@ msgstr ""
 "Legt die LaTeX-Anzeigengröße fest. Je höher der Wert, desto größer die "
 "Anzeige."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4027,13 +4068,13 @@ msgstr ""
 "Gültige URI-Schemata. Nur URIs, die den Schemata in dieser Liste aufgeführt "
 "sind, werden als Links behandelt und hervorgehoben."
 
-#: ../src/common/config.py:272
+#: ../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:283
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4041,7 +4082,7 @@ msgstr ""
 "Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten "
 "werden in den \"autopriority_*\"-Optionen festgelegt."
 
-#: ../src/common/config.py:291
+#: ../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"
@@ -4050,29 +4091,29 @@ msgstr ""
 "Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
 "kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 "Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/common/config.py:297
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Falls deaktiviert, wird die Anwesenheit selbst dann nicht mit einem GPG-"
 "Schlüssel signiert, wenn GPG konfiguriert ist."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4080,36 +4121,45 @@ msgstr ""
 "Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
 "Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
 "übertragen wird."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
 "Bibliothek geschützte Verbindung übertragen wird."
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:317
+#: ../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
+#, fuzzy
 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 "Wartezeit in Sekunden, bevor eine Verbindung wieder hergestellt wird."
 
 #. yes, no, ask
-#: ../src/common/config.py:321
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4118,15 +4168,15 @@ msgstr ""
 "file_transfer_proxies Option definierten Proxys für den Dateitransfer "
 "verwenden."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:348
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4134,11 +4184,11 @@ msgstr ""
 "Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
 "Sie Ihre Nachrichten aufzeichnen wollen?"
 
-#: ../src/common/config.py:406
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:407
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4146,102 +4196,102 @@ msgstr ""
 "Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
 "werden?"
 
-#: ../src/common/config.py:408 ../src/common/config.py:411
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
 # TODO: Review by german translators: getrennte Status || getrennter Status
-#: ../src/common/config.py:417
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "alle oder durch Leerzeichen getrennte Status"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:419 ../src/common/config.py:421
-#: ../src/common/config.py:422 ../src/common/config.py:425
-#: ../src/common/config.py:426
+#: ../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 "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:432 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:434 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:436 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:444 ../src/config.py:1407
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:447 ../src/common/config.py:448
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4249,68 +4299,68 @@ msgstr ""
 "Abzuspielender Ton, falls eine Chatraum-Nachricht eines der Wörter aus der "
 "muc_highlights_works-Liste oder Ihren Spitznamen enthält."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:468 ../src/common/optparser.py:235
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:472 ../src/common/optparser.py:221
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:480
+#: ../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 "Konnte Idle-Modul nicht laden"
 
-#: ../src/common/connection_handlers.py:236
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Falscher Server"
 
 # TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Ungültige Lokale Adresse!"
 
-#: ../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 ""
 "Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
 "angekommen"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:684
 msgid "Registration succeeded"
 msgstr "Registrierung war erfolgreich"
 
 # FIXME: Type in original string. Should be
 # Registration with agent %s succeeded
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:685
 #, fuzzy, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrierung mit Transport %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 msgid "Registration failed"
 msgstr "Registrierung ist fehlgeschlagen"
 
 # FIXME: Type in original string. Should be
 # Registration with agent ...
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 #, fuzzy, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4318,41 +4368,41 @@ msgstr ""
 "Registrierung mit Transport %(agent)s ist mit Fehler %(error)s "
 "fehlgeschlagen: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:968
-#: ../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:1342
-#: ../src/gajim.py:378
+#: ../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 "Fehler beim Schreiben auf Festplatte"
 
-#: ../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 "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../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 "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1790 ../src/common/connection.py:1157
-#: ../src/config.py:1835 ../src/config.py:1843 ../src/config.py:1886
-#: ../src/config.py:3111 ../src/dataforms_widget.py:536 ../src/dialogs.py:2362
+#: ../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 "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1791
+#: ../src/common/connection_handlers.py:1892
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
 "Nachricht wurde ignoriert."
 
-#: ../src/common/connection_handlers.py:1965
-#: ../src/common/connection_handlers.py:2011
-#: ../src/common/connection_handlers.py:2199
-#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1345
-#: ../src/gajim.py:159
+#: ../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."
@@ -4362,79 +4412,78 @@ msgstr ""
 "reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
 "löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/common/connection_handlers.py:2083
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2158
-#: ../src/common/connection_handlers.py:2161
-#: ../src/common/connection_handlers.py:2164
-#: ../src/common/connection_handlers.py:2167
-#: ../src/common/connection_handlers.py:2171 ../src/gajim.py:531
+#: ../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 "Fehler beim Betreten des Chatraums"
 
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sie wurden aus dem Chatraum %s verbannt."
 
-#: ../src/common/connection_handlers.py:2162
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Der Chatraum %s existiert nicht."
 
-#: ../src/common/connection_handlers.py:2165
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Die Chatraumerstellung ist eingeschränkt."
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
 
-#: ../src/common/connection_handlers.py:2172
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2214
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers.py:2221
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers.py:2248
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2269
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Sie haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:2271
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:2273
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:2456
+#: ../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 "
@@ -4446,16 +4495,16 @@ msgstr ""
 
 # TODO: GPG/PGP unification in original strings needed
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2481
+#: ../src/common/connection_handlers.py:2614
 #: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt."
 
 # TODO: GPG/PGP unification in original strings needed
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2483
+#: ../src/common/connection_handlers.py:2616
 #: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1930
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
@@ -4591,84 +4640,84 @@ msgstr ""
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:271
+#: ../src/common/connection.py:281
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:272
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:283
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %"
 "(error)s"
 
-#: ../src/common/connection.py:317
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
 "%(error)s"
 
-#: ../src/common/connection.py:629 ../src/common/connection.py:755
-#: ../src/common/connection.py:1478
+#: ../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 "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:630 ../src/gajim.py:1083
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr ""
 "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: ../src/common/connection.py:635
+#: ../src/common/connection.py:645
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Absender: %s"
 
-#: ../src/common/connection.py:648
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../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 "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../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 ""
 "Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
 "wiederhergestellt."
 
-#: ../src/common/connection.py:702
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Die Authentizität des %s Zertifikats könnte ungültig sein."
 
-#: ../src/common/connection.py:705
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4677,7 +4726,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4686,24 +4735,24 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:756
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:783
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:844
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../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 "
@@ -4713,20 +4762,20 @@ msgstr ""
 "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
 "es erneut."
 
-#: ../src/common/connection.py:1158 ../src/dialogs.py:2363
+#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 "Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
 
-#: ../src/common/connection.py:1180
+#: ../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 ""
 "Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
 "zugewiesen."
 
-#: ../src/common/connection.py:1182
+#: ../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."
@@ -4736,11 +4785,11 @@ 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 "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:1332
+#: ../src/common/connection.py:1359
 #: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
@@ -4750,20 +4799,30 @@ msgstr ""
 "Thema: %(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 "_Kontakte einladen"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:988
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Beobachter"
 
 #: ../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:801 ../src/roster_window.py:814
-#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1683
+#: ../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 "Transporte"
 
@@ -4772,11 +4831,11 @@ msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
 #. 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 "Auf diesem Computer fehlen die Python-Bibliotheken für D-Bus."
 
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Die D-Bus-Fähigkeiten können nicht genutzt werden."
 
@@ -4807,1033 +4866,1043 @@ msgstr ""
 "Sitzungsbus ist nicht verfügbar.\n"
 "Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "Zwölf"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "Eins"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "Zwei"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "Drei"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "Vier"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "Fünf"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "Sechs"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "Sieben"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "Acht"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "Neun"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "Zehn"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "Elf"
 
+#. 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 "Zwölf"
-
-#. 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 "fünf nach $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "fünf nach %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "zehn nach $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "zehn nach %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "viertel nach $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "viertel nach %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "zwanzig nach $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "zwanzig nach %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fünf vor halb $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "fünf vor halb %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "halb $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "halb %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "fünf nach halb $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "fünf nach halb %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "zwanzig vor $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "zwanzig vor %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "viertel vor $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "viertel vor %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "zehn vor $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "zehn vor %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fünf vor $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "fünf vor %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 Uhr"
+#: ../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 "Nachts"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Früh Morgens"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morgens"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Fast Mittags"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Mittags"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Nachmittags"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Abends"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Spät Abends"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Anfang der Woche"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Mitte der Woche"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Ende der Woche"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server-Adresse benötigt."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen im Rechnernamen."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in der Ressource."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?Kontakt hat Status: Unbekannt"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?Kontakt hat Status: Hat einen Fehler"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement schon vorhanden:Keines"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Frage nach Abonnement: Keine"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppenchat Kontaktrolle: Keine"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../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 "Teilnehmer"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "schreibt im Moment …"
 
 #. 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 "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
 #. 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:1092 ../src/common/helpers.py:1099
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d neue Nachricht"
 msgstr[1] "%d neue Nachrichten"
 
-#: ../src/common/helpers.py:1105
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr "Vom Chatraum %s"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1127
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "Vom Benutzer %s"
 
-#: ../src/common/helpers.py:1110
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1117 ../src/common/helpers.py:1124
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d neues Ereignis"
 msgstr[1] "%d neue Ereignisse"
 
-#: ../src/common/helpers.py:1157
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s ist kein gültiger Loglevel."
+
 #. 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 "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../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 "migriere Logdatenbank zu Indizes"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP-Konto %s@%s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Verängstigt"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Verblüfft"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Verliebt"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Wütend"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Ärgerlich"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Ängstlich"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Erregt"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Beschämt"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Tapfer"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Gelassen"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Vorsichtig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Kalt"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Zuversichtlich"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Verwirrt"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Nachdenklich"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Zufrieden"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Reizbar"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Verrückt"
 
-#: ../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 "Neugierig"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Niedergeschlagen"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Deprimiert"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Enttäuscht"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Angewidert"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Betroffen"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Abgelenkt"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Verlegen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Neidisch"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Kokett"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustriert"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Dankbar"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Bekümmert"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Mürrisch"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Schuldbewusst"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Fröhlich"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Hoffnungsvoll"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Heiß"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Demütig"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Gedemütigt"
 
-#: ../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 "Verletzt"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Beeindruckt"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Bewundernd"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Verliebt"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Entrüstet"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Interessiert"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Berauscht"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Unbesiegbar"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Neidisch"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Einsam"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Verloren"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Glücklich"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Gemein"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Launisch"
 
-#: ../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 "Beleidigt"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Empört"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Scherzhaft"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Stolz"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Entspannt"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Erleichtert"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Reuevoll"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Ruhelos"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Traurig"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarkastisch"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Zufrieden"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Ernst"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Geschockt"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Schüchtern"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Krank"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Müde"
 
-#: ../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 "Gestresst"
 
-#: ../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 "Überrascht"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Dankbar"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Durstig"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Müde"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Undefiniert"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Schwach"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Besorgt"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Haushalt erledigen"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Lebensmittel einkaufen"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Putzen"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Kochen"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Instandhaltung"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Geschirr spülen"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Wäsche waschen"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Gartenarbeit"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Besorgungen machen"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Hund ausführen"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Etwas trinken"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Bier trinken"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Kaffee trinken"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Tee trinken"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Zwischenmahlzeit"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Frühstücken"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Abendessen"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Mittagessen"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Rad fahren"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Tanzen"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Wandern"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Joggen"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Beim Sport"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Laufen"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Ski fahren"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Schwimmen"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Trainieren"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Körperpflege"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "Im Bad"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Zähne putzen"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Beim Frisör"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Rasieren"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Ein Bad nehmen"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Unter der Dusche"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Termin"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Freier Tag"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Rumhängen"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Verstecken"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Beten"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Geplanter Urlaub"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Nachdenken"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Entspannen"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Angeln"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Spielen"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Ausgehen"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Feiern"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Lesen"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Studieren"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Shoppen"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Rauchen"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Unter Leuten"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Sonnenbaden"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Fernsehen"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Film schauen"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Im Gespräch"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "Im echten Leben"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Am Videotelefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Reisen"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Pendeln"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Fahren"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "Im Auto"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "Im Bus"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "Im Flugzeug"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "Im Zug"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "Auf einer Reise"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Spazierengehen"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Programmieren"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "In einer Besprechung"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Lernen"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Schreiben"
 
@@ -5932,45 +6001,37 @@ msgstr "Die Nachricht konnte nicht gesendet werden."
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Der Kontakt ist offline. Ihre Nachricht konnte nicht gesendet werden."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:588
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Die Verbindung zum Server konnte nicht hergestellt werden: "
 "Zeitüberschreitung beim Senden von Daten."
 
-#: ../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 "Fehler beim Hinzufügen des Dienstes. %s"
 
-#: ../src/config.py:151 ../src/config.py:605
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: ../src/config.py:392
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Standard-Nachricht"
 
-#: ../src/config.py:399
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:441
-msgid "Always use OS/X default applications"
-msgstr "Immer OS/X-Standardprogramme verwenden"
-
-#: ../src/config.py:442
-msgid "Custom"
-msgstr "Benutzerdefiniert"
-
-#: ../src/config.py:671 ../src/dialogs.py:1201
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:672
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5979,50 +6040,50 @@ msgstr ""
 "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
 "um die Rechtschreibprüfung nutzen zu können."
 
-#: ../src/config.py:1049
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1049
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1329 ../src/dialogs.py:1828 ../src/dialogs.py:1892
-#: ../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 "Name"
 
-#: ../src/config.py:1415
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1416
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Wenn die Änderungen sofort übernommen werden sollen, müssen Sie sich erneut "
 "anmelden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:1544 ../src/config.py:1645
+#: ../src/config.py:1521 ../src/config.py:1643
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1681 ../src/config.py:1724
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1682
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:1708
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:1709
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
@@ -6074,127 +6135,127 @@ msgstr "Konto umbenennen"
 msgid "Enter a new name for account %s"
 msgstr "Geben Sie einen neuen Namen für das Konto %s ein"
 
-#: ../src/config.py:1844
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Die Jabber-ID muss in der Form \"benutzer@servername\" sein."
 
-#: ../src/config.py:2034 ../src/config.py:3171
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2035 ../src/config.py:3172
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2056
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Die geheimen Schlüssel konnten nicht empfangen werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2057
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Es gab ein Problem beim Empfangen Ihres geheimen OpenPGP-Schlüssels."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2092
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2093
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2100
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
 "ändern können."
 
-#: ../src/config.py:2108 ../src/dialogs.py:1680 ../src/dialogs.py:1816
-#: ../src/dialogs.py:1995 ../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 "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2109
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
 "können."
 
-#: ../src/config.py:2113
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2114
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2145
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2146
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
 "aktivieren."
 
-#: ../src/config.py:2329
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2367
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2368
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2369
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2370
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2419 ../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 "Jabber-ID"
 
-#: ../src/config.py:2429
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2436
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2442
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2469
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2471
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6202,11 +6263,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6214,11 +6275,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2476
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2477
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6226,11 +6287,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2479
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2480
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6238,7 +6299,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2481
+#: ../src/config.py:2500
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6256,79 +6317,90 @@ msgstr ""
 "benutzer@servername, jeder servername/Ressource oder jede Adresse, die eine "
 "Subdomain enthält)."
 
-#: ../src/config.py:2578
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2600 ../src/gajim.py:1472 ../src/gajim.py:1559
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2601 ../src/gajim.py:1542
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2602 ../src/gajim.py:1559
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2611
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2612
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2708
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2708
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2709
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2778
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:2811
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:2812
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
 
-#: ../src/config.py:3094
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3096
-msgid "You must provide a username to configure this account."
-msgstr ""
-"Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Spitzname nicht erlaubt: %s"
+
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Ungültiger Server"
+
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:3128
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3129 ../src/config.py:3320
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6338,26 +6410,35 @@ msgstr ""
 "oder den Konto-Menüpunktes im Menü \"Bearbeiten\" des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:3147
-msgid "Invalid server"
-msgstr "Ungültiger Server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Ihr neues Konto wurde erfolgreich erstellt"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3148
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr ""
+"Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Bitte geben Sie den Server an, bei dem Sie sich registrieren möchten."
 
-#: ../src/config.py:3199 ../src/gajim.py:2101
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3200 ../src/gajim.py:2102
+#: ../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 ""
 "Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
 "Datei %s befindet."
 
-#: ../src/config.py:3268
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6372,7 +6453,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3274 ../src/gajim.py:2126
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6383,67 +6464,63 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3299 ../src/config.py:3340
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3319
-msgid "Your new account has been created successfully"
-msgstr "Ihr neues Konto wurde erfolgreich erstellt"
-
-#: ../src/config.py:3406
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3407
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:3560
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3568
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:3603
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:3604
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:3606
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:3607
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:3608
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:3609
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:3610
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:3611
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:3612
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
-#: ../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"
@@ -6453,7 +6530,7 @@ msgstr ""
 "am anderen Ende eingetroffen ist. Falls es längere\n"
 "Zeit bleibt, ging die Nachricht höchstwahrscheinlich verloren."
 
-#: ../src/conversation_textview.py:579
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6461,71 +6538,76 @@ msgstr ""
 "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
 "diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:693
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Beenden"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:705
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:710
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:727
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Im Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In der URL für die Websuche fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
-#: ../src/conversation_textview.py:1203
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1207
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1241
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Die Jabber-ID steht bereits in der Liste"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
 "andere."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
@@ -6556,11 +6638,11 @@ msgstr "Schlüssel-ID"
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Stimmung setzen"
 
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusnachricht"
@@ -6569,112 +6651,112 @@ msgstr "%s Statusnachricht"
 msgid "Status Message"
 msgstr "Statusnachricht"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
-#: ../src/dialogs.py:665
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
 "überschreiben?"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Als Vorlage für Statusnachrichten speichern"
 
-#: ../src/dialogs.py:675
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Bitte geben Sie einen Namen für diese Statusnachricht ein:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM-Adresse"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG-Nummer"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ-Nummer"
 
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN-Adresse"
 
-#: ../src/dialogs.py:685
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo-Adresse"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:723
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:880 ../src/dialogs.py:886 ../src/dialogs.py:891
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:892
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:907
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:943
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1003
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1015
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1027
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Zuletzt möchten wird gerne allen Paket-Verwaltern danken."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1040
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -6684,7 +6766,7 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1202
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6697,89 +6779,89 @@ msgstr ""
 "\n"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1606
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Die Jabber-ID enthält ungültige Zeichen."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnement-Anfrage für das Konto %(account)s von %(jid)s"
 
-#: ../src/dialogs.py:1609
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:1673 ../src/gajim.py:2766
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:1681
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Sie können einen Chatraum erst betreten, wenn Sie verbunden sind."
 
-#: ../src/dialogs.py:1700
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:1771
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:1772 ../src/groupchat_control.py:1455
-#: ../src/groupchat_control.py:1738
-msgid "The nickname has not allowed characters."
-msgstr "Die Jabber-ID enthält ungültige Zeichen."
-
-#: ../src/dialogs.py:1776 ../src/dialogs.py:1782
-#: ../src/groupchat_control.py:1908
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:1777 ../src/dialogs.py:1783
-#: ../src/groupchat_control.py:1909
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1789
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:1790
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:1817
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sie müssen verbunden sein, um Ihre Kontakte synchronisieren zu können."
 
-#: ../src/dialogs.py:1831
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1864
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:1865
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: ../src/dialogs.py:1889
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:1947
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:1949
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:1950
+#: ../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:"
@@ -6788,276 +6870,302 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1974 ../src/dialogs.py:2348 ../src/dialogs.py:2498
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:1975 ../src/dialogs.py:2349 ../src/dialogs.py:2499
+#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:1984 ../src/dialogs.py:1987
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:1987
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:1996
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort ändern zu können."
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2019
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2060 ../src/notify.py:261 ../src/notify.py:502
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2062 ../src/notify.py:269 ../src/notify.py:504
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2064 ../src/notify.py:292 ../src/notify.py:346
-#: ../src/notify.py:506 ../src/osx/growler.py:12
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/notify.py:495
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2064 ../src/notify.py:273 ../src/notify.py:347
-#: ../src/notify.py:506 ../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 "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2065 ../src/notify.py:280 ../src/notify.py:347
-#: ../src/notify.py:507 ../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 "Neue private Nachricht"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1675 ../src/notify.py:516
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1741 ../src/notify.py:509
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1641 ../src/gajim.py:1708
-#: ../src/notify.py:511 ../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 "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1783 ../src/gajim.py:1805
-#: ../src/gajim.py:1822 ../src/notify.py:513 ../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 "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2072 ../src/gajim.py:1786 ../src/notify.py:514
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2074 ../src/gajim.py:1493 ../src/notify.py:518
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2076 ../src/notify.py:253 ../src/notify.py:520
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2267
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2269
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2274
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2297
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2320
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Von %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2399
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2400
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:2446
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML-Konsole"
 
-#: ../src/dialogs.py:2570
+#. 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 "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Launisch"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber-ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Gruppe"
+
+#. 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 "Ich würde dich gerne zu meiner Kontaktliste hinzufügen."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:2630
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: ../src/dialogs.py:2635
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:2677
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:2764
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:2862
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:2932
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:2933
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 "Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
 "können."
 
-#: ../src/dialogs.py:2965
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact hat Sie in den Chatraum %(room_jid)s eingeladen"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2980
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3036
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3046 ../src/dialogs.py:3097
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3051
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:3084
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:3102
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3167
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:3169
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
 #. # means number
-#: ../src/dialogs.py:3238
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "Nr."
 
-#: ../src/dialogs.py:3244
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:3362
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:3834
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7069,19 +7177,19 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)"
 "s</b>"
 
-#: ../src/dialogs.py:3838
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:3844 ../src/dialogs.py:3931
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:3852
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:3857
+#: ../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 "
@@ -7091,19 +7199,19 @@ msgstr ""
 "Nachrichten lesen oder Ihnen Nachrichten senden kann, müssen Sie seine "
 "Identität überprüfen, indem Sie die Schaltfläche weiter unten betätigen."
 
-#: ../src/dialogs.py:3860 ../src/dialogs.py:3912 ../src/dialogs.py:3925
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:3867
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:3879
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:3880
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7119,13 +7227,13 @@ msgstr ""
 "Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
 "b>"
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 "Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
 "Schluessel zu überprüfen?"
 
-#: ../src/dialogs.py:3913
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
@@ -7133,14 +7241,14 @@ msgstr ""
 "Schlüssel überein."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:3919
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
 "verschlüsselt werden."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:3926
+#: ../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."
@@ -7151,7 +7259,7 @@ msgstr ""
 "einzustufen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:3932
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7159,33 +7267,33 @@ msgstr ""
 "Ein vertrauenswürdiger GPG-Schlüssel ist dem Kontakt zugewiesen. Die "
 "Nachrichten werden verschlüsselt."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein, um die Dienste durchsuchen zu können"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:657
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../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."
@@ -7194,223 +7302,243 @@ msgstr ""
 "Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
 "erneut."
 
-#: ../src/disco.py:662 ../src/disco.py:958
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:663
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr ""
 "Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
 
-#: ../src/disco.py:700 ../src/disco.py:710
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:757
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:797
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:959
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1581
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Beschreibung"
 
 #. 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 "Chatraum ist bereits gespeichert"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Chatraum wurde erfolgreich gespeichert"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
+"Kontaktliste bearbeiten"
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 msgid "SSL certificat validation"
 msgstr "SSL/TLS-Zertifikatprüfung"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Ermöglicht die Validierung von Server-Zertifikaten, die eine sichere "
 "Verbindung gewährleisten."
 
-#: ../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 "Erfordert 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 ""
 "Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen "
 "Netzwerken."
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Erfordert python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 "Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Command line"
 msgstr "Kommandozeilensteuerung"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Ermöglicht es, Gajim per Skript über die Konsole zu steuern."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Erfordert 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 "Funktion unter Windows nicht verfügbar."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP-Verschlüsselung"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Ermöglicht die Verschlüsselung von Nachrichten per OpenPGP."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Erfordert GnuPG und python-GnuPGInterface."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 msgid "Network-manager"
 msgstr "Netzwerk-Manager"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Ermöglicht die automatische Erkennung des Netzwerkstatus."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Erfordert gnome-network-manager und python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Sitzungsverwaltung"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Die Gajim-Sitzung kann beim Logout gespeichert und beim Login "
 "wiederhergestellt werden."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Erfordert python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Password encryption"
 msgstr "Sichere Kennwortverwaltung"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passwörter können sicher anstatt nur im Klartext gespeichert werden."
 
-#: ../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 "Erfordert gnome-keyring und 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 "Ermöglicht Verbindungen zu Servern, die SRV-DNS-Einträge verwenden."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Erfordert dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Erfordert nslookup zur Nutzung von SRV-Einträgen."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Rechtschreibprüfung"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 "Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires libgtkspell."
 msgstr "Erfordert die libgtkspell-Bibliothek."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Notification"
 msgstr "Benachrichtigungen"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Ermöglicht passive Popups, die über neue Ereignisse informieren."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7418,54 +7546,54 @@ msgstr ""
 "Erfordert python-notify oder stattdessen python-dbus in Verbindung mit "
 "notification-daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Tray-Symbol"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ein Symbol im Systemtray, das den Status widerspiegelt."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Erfordert python-gnome2-extras oder die Kompilation des Trayicon-Moduls aus "
 "den Gajim-Quellen"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Erforder PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatischer Status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Emöglicht die Messung der Zeit, während der der Computer nicht benutzt wird, "
 "um den Status automatisch zu setzen."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Erfordert die libxss-Bibliothek."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Erfordert python-gnome2 (Version 2.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 ""
 "Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als "
 "LaTeX interpretiert."
 
-#: ../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."
@@ -7473,7 +7601,7 @@ msgstr ""
 "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Im "
 "erweiterten Konfigurationseditor muss 'use_latex' auf 'true' gesetzt werden."
 
-#: ../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."
@@ -7481,23 +7609,23 @@ msgstr ""
 "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen "
 "'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "ESession-Verschlüsselung"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "Nachrichten können per ESession verschlüsselt werden."
 
-#: ../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 "Erfordert 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)."
@@ -7505,23 +7633,23 @@ msgstr ""
 "Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge."
 "net/docs/ref/rst/restructuredtext.html (Englisch))."
 
-#: ../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 "Erfordert python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr "Anklickbare Links"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Anklickbare URLs im Chatfenster."
 
-#: ../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 "Erfordert python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Feature"
 
@@ -7542,7 +7670,7 @@ msgstr "Fortschritt"
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
@@ -7550,7 +7678,7 @@ msgstr "Größe: %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 "Sie"
 
@@ -7559,8 +7687,8 @@ msgstr "Sie"
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
-#: ../src/tooltips.py:671
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -7592,51 +7720,52 @@ msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Die Gegenseite hat Dateiübertragung gestoppt"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Dateiübertragung gestoppt"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Datei auswählen …"
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Auf diese Datei kann nicht zugegriffen werden"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte Ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:334 ../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."
@@ -7644,35 +7773,35 @@ msgstr ""
 "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
 "erforderlichen Rechte, um sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
 #. 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:360 ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:360 ../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 ""
 "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
 "anzulegen."
 
-#: ../src/filetransfers_window.py:370
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Datei speichern unter …"
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:436
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7680,60 +7809,69 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:593 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:595 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:145
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 
-#: ../src/gajim.py:174
-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 benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:175
-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 benötigt PyGTK 2.6 oder höher. Abbruch …"
 
-#: ../src/gajim.py:177
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:178
-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 benötigt GTK 2.6+. Abbruch …"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Der GTK+-Laufzeitumgebung fehlt die libglade-Unterstützung"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7742,22 +7880,22 @@ msgstr ""
 "Bitte entfernen Sie Ihre derzeitige GTK+-Laufzeitumgebung und installieren "
 "Sie die aktuelle Version von %s"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Bitte stellen Sie sicher, dass die auf Ihrem Computer verwendeten Versionen "
 "von GTK+ und PyGTK libglade-Unterstützung besitzen."
 
-#: ../src/gajim.py:192
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim benötigt PySQLite2 zum Starten"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7767,11 +7905,11 @@ msgstr ""
 "können es unter folgender URL herunterladen: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:352
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:353
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7779,12 +7917,12 @@ msgstr ""
 "Gajim schein bereits zu laufen.\n"
 "Soll eine weitere Instanz gestartet werden?"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:444
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
@@ -7792,30 +7930,30 @@ msgstr ""
 "(account)s)."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:458
+#: ../src/gajim.py:443
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:459
+#: ../src/gajim.py:444
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP-Verschlüsselung mit %s verbunden."
 
 #. ask again
-#: ../src/gajim.py:468
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:469
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
 "Abbrechen."
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7826,54 +7964,58 @@ msgstr ""
 "von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gajim.py:546
+#: ../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 "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:548
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
 
-#: ../src/gajim.py:551
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:602 ../src/notify.py:522 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gajim.py:926 ../src/gajim.py:930
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fehler %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:940 ../src/gajim.py:954
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977 ../src/notify.py:524
+#: ../src/gajim.py:970 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Abonnementanfrage"
 
-#: ../src/gajim.py:1002
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:1003
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" hat Sie autorisiert, seinen Status zu sehen."
 
-#: ../src/gajim.py:1015
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:1016
+#: ../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?"
@@ -7881,79 +8023,79 @@ msgstr ""
 "Er wird Ihnen von nun an als offline angezeigt.\n"
 "Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gajim.py:1041 ../src/notify.py:526
+#: ../src/gajim.py:1034 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: ../src/gajim.py:1082
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:1271 ../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 heißt jetzt %(new_nick)s"
 
-#: ../src/gajim.py:1289 ../src/groupchat_control.py:1341
-#: ../src/history_window.py:428 ../src/notify.py:248
+#: ../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 ist jetzt %(status)s"
 
-#: ../src/gajim.py:1356
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s hat das Thema in %(subject)s geändert"
 
 #. 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:1420 ../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 "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
-#: ../src/gajim.py:1423
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
 "aufgetreten"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/gajim.py:1438
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Der Chatraum ist jetzt komplett anonym"
 
-#: ../src/gajim.py:1473
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1507
+#: ../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"
@@ -7962,22 +8104,22 @@ msgstr ""
 "jedoch kein GPG-Agent oder er gab eine falsche Passphrase zurück.\n"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1509
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:1512
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1535
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG ist nicht benutzbar"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim.py:1535
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7986,12 +8128,13 @@ msgstr ""
 "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht "
 "verschlüsselt werden."
 
-#: ../src/gajim.py:1537 ../src/gajim.py:2184 ../src/gajim.py:2219
-#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3827
+#: ../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 "_Nicht noch einmal fragen"
 
-#: ../src/gajim.py:1545
+#: ../src/gajim.py:1540
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -8000,19 +8143,19 @@ msgstr ""
 "gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t"
 "\tkorrekt gesetzt gesetzt)"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
 
-#: ../src/gajim.py:1654
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Sie haben %d ungelesene E-Mail"
 msgstr[1] "Sie haben %d ungelesene E-Mails"
 
-#: ../src/gajim.py:1667
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -8027,35 +8170,45 @@ msgstr ""
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1738
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gajim.py:1806
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Entfernt den Kontakt aus der Kontaktliste"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fehler beim Lesen der Datei:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Die Übermittlung der Datei %(filename)s von %(name)s war erfolgreich."
 
 #. ft stopped
-#: ../src/gajim.py:1810
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben die Datei %(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/gajim.py:1827
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Die Dateiübertragung von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/gajim.py:1924
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8064,36 +8217,36 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: ../src/gajim.py:1931
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Bitte geben Sie einen neuen Benutzernamen für Ihr lokales Konto ein"
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2042
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/gajim.py:2067
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8101,11 +8254,11 @@ msgstr ""
 "Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte "
 "geben Sie eine neue Ressource ein"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8116,17 +8269,17 @@ msgstr ""
 "Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gajim.py:2149
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
 # FIXME: Check English. Should be:
 # your connection has been hacked.
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8136,19 +8289,19 @@ msgid ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
-"Das SSL-Zertifikat %(account)s scheint sich geändert zu haben oder die Verbindung wurde "
-"angegriffen.\n"
+"Das SSL-Zertifikat %(account)s scheint sich geändert zu haben oder die "
+"Verbindung wurde angegriffen.\n"
 "Alter Fingerabdruck: %(old)s\n"
 "Neuer Fingerabdruck: %(new)s\n"
 "\n"
 "Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
 "aktualisieren?"
 
-#: ../src/gajim.py:2180 ../src/gajim.py:2215
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/gajim.py:2181
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8156,11 +8309,11 @@ msgstr ""
 "Sie sind dabei, Ihr Passwort über eine nicht verschlüsselte Verbindung zu "
 "senden. Sind Sie sicher, dass Sie dies tun möchten?"
 
-#: ../src/gajim.py:2183 ../src/gajim.py:2218
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/gajim.py:2216
+#: ../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?"
@@ -8169,21 +8322,21 @@ msgstr ""
 "Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
 "installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gajim.py:2236
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP-Knoten wurde nicht entfernt"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2723 ../src/gajim.py:2745
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gajim.py:2724
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8191,7 +8344,7 @@ msgstr ""
 "Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
 "deaktiviert."
 
-#: ../src/gajim.py:2746
+#: ../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 "
@@ -8201,104 +8354,86 @@ msgstr ""
 "eventuell das Format der Datei emoticons.py aktualisieren. Besuchen Sie "
 "http://trac.gajim.org/wiki/Emoticons (Englisch) für mehr Informationen."
 
-#: ../src/gajim.py:2772 ../src/roster_window.py:3315
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Sie können einen Chatraum nicht betreten, wenn Sie unsichtbar sind."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3050
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:3147
-msgid "Bookmark already set"
-msgstr "Chatraum ist bereits gespeichert"
-
-#: ../src/gajim.py:3148
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
-
-#: ../src/gajim.py:3161
-msgid "Bookmark has been added successfully"
-msgstr "Chatraum wurde erfolgreich gespeichert"
-
-#: ../src/gajim.py:3162
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
-"Kontaktliste bearbeiten"
-
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Zeigt die Hilfe für einen bestimmten Befehl"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "Befehl"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "zeige Hilfe für Befehl"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Zeige Popup-Fenster mit dem nächsten ungelesenen Ereignis"
 
-#: ../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"
 msgstr ""
 "Gibt eine Liste aller Kontakte in der Kontaktliste aus. Eine Zeile je Kontakt"
 
-#: ../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 "zeige nur Kontakte für das gegebene Konto"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Gibt eine Liste registrierter Konten aus"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ändert den Status eines oder mehrerer Konten"
 
 #. 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 "Mögliche Werte: 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 "Nachricht"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "Statusnachricht"
 
-#: ../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"
@@ -8307,20 +8442,24 @@ msgstr ""
 "aller Konten für die die Option \"Kontostatus mit globalem Status "
 "synchronisieren\" aktiviert ist"
 
-#: ../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 ""
 "Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden "
 "kann"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
 
-#: ../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 "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
 #: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8520,51 +8659,56 @@ msgstr "Zu verarbeitender URI"
 msgid "Account in which you want to handle it"
 msgstr "Konto, mit dem er verarbeitet werden soll"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "Nachrichteninhalt"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Jabber-ID des Chatraums"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Spitzname, der benutzt werden soll"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Das Passwort, um den Chatraum zu betreten"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8573,17 +8717,17 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Kein aktives 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 ""
 "Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
 "werden."
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8592,16 +8736,16 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8610,7 +8754,7 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Der Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:482
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8620,7 +8764,7 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: ../src/gajim-remote.py:487
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8630,7 +8774,7 @@ msgstr ""
 "Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
 "erhalten"
 
-#: ../src/gajim-remote.py:506
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
@@ -8647,15 +8791,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Bitte erstellen Sie ein neues leeres Design mit dem gewünschten Namen."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "Name des Themas"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Sie können Ihr derzeitiges Design nicht löschen"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr ""
 "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
@@ -8672,149 +8816,151 @@ msgstr ""
 "Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
 "den Chatraum verlassen."
 
-#: ../src/groupchat_control.py:453
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:607
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
-#: ../src/groupchat_control.py:1014
-msgid "Really send file?"
-msgstr "Datei wirklich senden?"
-
-#: ../src/groupchat_control.py:1015
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Wenn Sie eine Datei an %s senden, wird der Kontakt Ihre echte Jabber-ID "
-"kennen."
-
 #. 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 "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1131
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Der Server hat Ihren Chatraum-Nick zugewiesen oder verändert"
 
 #. 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 wurde aus dem Chatraum geworfen. Grund: %(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 wurde von %(who)s aus dem Chatraum geworfen. Grund: %(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 wurde gebannt. Grund: %(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 wurde von %(who)s gebannt. Grund: %(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 "Sie heißen nun %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 wurde aus dem Chatraum geworfen. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1203
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../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 ""
 "** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
 "gesetzt"
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Mitgliedschaft von %(nick)s wurde an %(affiliation)s gesendet"
 
-#: ../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 "** Die Rolle von %(nick)s wurde durch %(actor)s in %(role)s geändert"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Die Rolle von %(nick)s wurde in %(role)s geändert"
 
-#: ../src/groupchat_control.py:1334
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1339
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
-msgid "Invalid nickname"
-msgstr "Ungültiger Benutzername"
-
-#: ../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 "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_control.py:1512
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Dieser Chatraum hat kein Thema"
 
-#: ../src/groupchat_control.py:1524
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
 
-#: ../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 "Spitzname nicht gefunden: %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 ""
 "Verwendung: /%s <Spitzname|Jabber-ID> [Grund], verbannt die Jabber-ID aus "
 "dem Chatraum. Der Spitzname eines Teilnehmers kann hinzugefügt werden, wenn "
@@ -8822,7 +8968,7 @@ msgstr ""
 "zusätzlich herausgeworfen. Leerzeichen im Spitznamen werden nicht "
 "unterstützt."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8831,7 +8977,7 @@ msgstr ""
 "Verwendung: /%s <Spitzname>, öffnet ein privates Nachrichtenfenster mit dem "
 "Inhaber des angegebenen Spitznamens."
 
-#: ../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 "
@@ -8840,7 +8986,7 @@ msgstr ""
 "Verwendung: /%s [Grund], schließt das aktuelle Fenster oder den aktuellen "
 "Tab, optional mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8849,7 +8995,7 @@ msgstr ""
 "Verwendung: /%s <Jabber-ID> [Grund], lädt die Jabber-ID in den aktuellen "
 "Chatraum ein, optional mit der Angabe eines Grundes."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8858,18 +9004,17 @@ msgstr ""
 "Verwendung: /%s <Chatraum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Chatraum@Server an, optional mit Spitznamen."
 
-#: ../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 ""
 "Verwendung: /%s <Spitzname> [Grund], entfernt den Inhaber des angegebenen "
 "Spitznamens aus dem Chatraum, optional mit Grund. Leerzeichen im Spitznamen "
 "werden nicht unterstützt."
 
-#: ../src/groupchat_control.py:1696
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8879,25 +9024,25 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamens."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Verwendung: /%s, zeigt die Namen der Teilnehmer im Chatraum an."
 
-#: ../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 ""
 "Verwendung: /%s [topic], zeigt oder aktualisiert das derzeitige Chatraum-"
 "Thema."
 
-#: ../src/groupchat_control.py:1712
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8905,41 +9050,56 @@ msgstr ""
 "Verwendung: /%s <Nachricht>, sendet eine Nachricht, ohne andere Befehle zu "
 "beachten."
 
-#: ../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 ""
+"Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
 
-#: ../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 ""
 "Wenn Sie dieses Fenster schließen, wird die Verbindung zu diesem Chatraum "
 "geschlossen."
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1888
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1915
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %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:"
@@ -8947,22 +9107,22 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1918
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2089
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../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 "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2380
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8993,17 +9153,17 @@ msgstr "Details"
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Fehler bei der Dateianalyse:"
 
 #. 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 ""
@@ -9011,61 +9171,61 @@ msgstr ""
 "funktionieren"
 
 #. 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 ist nicht Ihr Standard-Jabber-Client"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Möchten Sie Gajim zu Ihrem Standard-Jabber-Client machen?"
 
-#: ../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 ""
 "Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../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 ""
 "Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
 "speichern?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Bild speichern unter …"
 
-#: ../src/history_manager.py:96
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufs-Datenkbank nicht finden"
 
 #. holds jid
-#: ../src/history_manager.py:136
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakte"
 
 #. 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 "Spitzname"
 
 #. 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 "Nachricht"
 
-#: ../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)"
@@ -9073,7 +9233,7 @@ msgstr ""
 "Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
 "LÄUFT)"
 
-#: ../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 "
@@ -9087,26 +9247,26 @@ msgstr ""
 "\n"
 "Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
 
-#: ../src/history_manager.py:433
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlauf …"
 
-#: ../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 sagte um %(time)s: %(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] "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
 msgstr[1] "Möchten Sie wirklich alle Logs der ausgewählten Kontakte löschen?"
 
-#: ../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 "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../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] "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
@@ -9136,27 +9296,37 @@ msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: ../src/htmltextview.py:564 ../src/htmltextview.py:575
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/htmltextview.py:585
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: ../src/message_window.py:433
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Sie sind nicht mit dem Server verbunden."
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Möchten Sie die ausgewählte Nachricht wirklich löschen?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:435
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:437
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -9168,70 +9338,66 @@ msgstr "- Nachrichten werden aufgezeichnet"
 msgid "- messages will not be logged"
 msgstr "- Nachrichten werden nicht aufgezeichnet"
 
-#: ../src/notify.py:246
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte seinen Status"
 
-#: ../src/notify.py:256
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:264
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:276
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:284
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Neue private Nachricht aus dem Chatraum %s"
 
-#: ../src/notify.py:286
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:285
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:295
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:564
+#: ../src/notify.py:555
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Allgemein"
-
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2759
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2762
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2764 ../src/roster_window.py:2775
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
@@ -9265,48 +9431,48 @@ msgstr ""
 "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
 "aufgetreten. Versuchen Sie es später erneut."
 
-#: ../src/roster_window.py:285 ../src/roster_window.py:939
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1869
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1890
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: ../src/roster_window.py:1903
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1904
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:1929
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
-#: ../src/roster_window.py:2093 ../src/roster_window.py:3259
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2094 ../src/roster_window.py:3260
+#: ../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?"
@@ -9314,15 +9480,28 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden Sie von diesen "
 "Chaträumen getrennt. Sind Sie sicher, dass Sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:2120
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../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 "Möchten Sie den Chatraum \"%s\" wirklich verlassen?"
+
+#: ../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 "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9330,16 +9509,16 @@ msgstr ""
 "Nachrichten sind nur für das spätere Lesen verfügbar, wenn der Verlauf "
 "aktiviert wurde und der Kontakt sich in der Kontaktliste befindet."
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2499
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2500
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9347,11 +9526,11 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
 "austauschen."
 
-#: ../src/roster_window.py:2503
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../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 "
@@ -9361,57 +9540,57 @@ msgstr ""
 "austauschen: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2639
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2640
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geben Sie einen Spitznamen für den Kontakt %s ein"
 
-#: ../src/roster_window.py:2647
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2648
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geben Sie einen neuen Namen für die Gruppe %s ein"
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Möchten Sie wirklich die Gruppe %s von Ihrer Kontaktliste entfernen?"
 
-#: ../src/roster_window.py:2707
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Auch alle Kontakte dieser Gruppe von Ihrer Kontaktliste entfernen"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:2747
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3100
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3102
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: ../src/roster_window.py:3107
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9421,11 +9600,11 @@ msgstr ""
 "offline sehen wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3113
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3116
+#: ../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."
@@ -9434,17 +9613,17 @@ msgstr ""
 "Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
 "offline sehen wird."
 
-#: ../src/roster_window.py:3119
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Ich möchte, dass dieser Kontakt meinen Status auch nach dem Entfernen sieht"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3123
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9454,22 +9633,22 @@ msgstr ""
 "entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
 "die Kontakte Sie nur noch als offline sehen werden."
 
-#: ../src/roster_window.py:3183
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3184
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
 "können."
 
-#: ../src/roster_window.py:3734
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:3736
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9478,14 +9657,14 @@ msgstr ""
 "Daher werden diese Informationen bei der nächsten Neuverbindung nicht "
 "gespeichert."
 
-#: ../src/roster_window.py:3821
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Sie sind dabei, einen Metakontakt zu erstellen. Wollen Sie wirklich "
 "fortfahren?"
 
-#: ../src/roster_window.py:3823
+#: ../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 "
@@ -9495,139 +9674,141 @@ msgstr ""
 "gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
 "Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:3936
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:3947
+#: ../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] "Wollen Sie die Datei an %s senden?"
 msgstr[1] "Wollen Sie die Dateien an %s senden?"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Sende %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Sendet dem Kontakt eine Datei"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4624 ../src/roster_window.py:4695
-#: ../src/roster_window.py:4704 ../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 "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:4711
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4716
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:4753 ../src/systray.py:278
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:4773
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:4813
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:4875 ../src/roster_window.py:4984
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:4902
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:4909
-msgid "Mood"
-msgstr "Stimmung"
-
-#: ../src/roster_window.py:4913
-msgid "Activity"
-msgstr "Aktivität"
-
-#: ../src/roster_window.py:4918
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5072
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
 #. Send Group Message
-#: ../src/roster_window.py:5080 ../src/roster_window.py:5606
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5088
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5092
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
-#: ../src/roster_window.py:5503
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne zu meiner Kontaktliste hinzufügen"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5626
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Send single message
-#: ../src/roster_window.py:5687
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5743
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5751
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Ändern"
 
-#: ../src/roster_window.py:5825
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5832
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
-#: ../src/roster_window.py:5912
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 #. History manager
-#: ../src/roster_window.py:6025
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:6034
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:6244
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
@@ -9648,16 +9829,16 @@ msgstr "Kein Ergebnis"
 msgid "Disk WriteError"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:403 ../src/session.py:438
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
-#: ../src/session.py:405
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9672,7 +9853,7 @@ msgstr ""
 "\n"
 "\t\tSind diese Einstellungen akzeptabel?"
 
-#: ../src/session.py:439
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9687,7 +9868,7 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht …"
 
@@ -9695,116 +9876,108 @@ msgstr "Ändere _Statusnachricht …"
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: ../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 "Ressource: "
 
-#: ../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 dieses Chatraums"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blockiert]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../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 "Letzter Status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Stimmung:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Aktivität:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Musiktitel:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../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"
@@ -9812,28 +9985,28 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Unbekannt"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:268
 msgid "?Time:Unknown"
 msgstr "?Time:Unbekannt"
 
-#: ../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 "seit %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Mitgliedschaft:</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"
@@ -9841,7 +10014,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
 "seinem interessiert"
 
-#: ../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"
@@ -9849,12 +10022,12 @@ msgstr ""
 "Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
 "interessiert"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Sie und der Kontakt sind am Status des Anderen interessiert"
 
 #. 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"
@@ -9862,34 +10035,65 @@ msgstr ""
 "Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem "
 "interessiert"
 
-#: ../src/vcard.py:353
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
 
-#: ../src/vcard.py:355
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: ../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 " Resource mit Priorität "
 
+#~ msgid "B_OSH Port:"
+#~ msgstr "B_OSH-Port:"
+
+#~ msgid "Show _roster"
+#~ msgstr "_Kontaktliste anzeigen"
+
+#~ msgid "Modify Account"
+#~ msgstr "Konto bearbeiten"
+
+#~ msgid "Use _custom port:"
+#~ msgstr "Verwende _benutzerdefinierten Port:"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s von %(artist)s\n"
+#~ "aus %(source)s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#~ msgid "Custom"
+#~ msgstr "Benutzerdefiniert"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Die Gegenseite hat Dateiübertragung gestoppt"
+
+#~ msgid "Generic"
+#~ msgstr "Allgemein"
+
+#~ msgid "Mood"
+#~ msgstr "Stimmung"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivität"
+
 #~ msgid "Your JID:"
 #~ msgstr "Ihre Jabber-ID:"
 
-#~ msgid "Error executing \"%(command)s\": %(error)s"
-#~ msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Doppelte Jabber-ID"
 
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Dieser Kontakt wurde bereits konfiguriert."
 
-#~ msgid "%s is not a valid loglevel"
-#~ msgstr "%s ist kein gültiger Loglevel."
-
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
diff --git a/po/el.po b/po/el.po
index 1c1ead564..0610a8234 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,10 +11,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-19 16:09+0200\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
-"Language-Team: \n"
+"Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +46,7 @@ msgid "_Add Contact..."
 msgstr "_Προσθήκη επαφής..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "Εύρεση _υπηρεσιών"
 
@@ -70,7 +70,7 @@ msgid "_Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Έναρξη συζήτησης"
@@ -105,68 +105,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των "
-"διακομιστών του jabber"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Χρήση πιστοποίησης"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Μεσολαβητής:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "_Αποθήκευση κωδικού"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Χαρακτηριστικά διακομιστή"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
@@ -179,31 +176,32 @@ msgstr ""
 "να συνδεθείτε στο Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Το JID σας:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "Για προ_χωρημένους"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Εξυπηρετητής:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Κωδικός πρόσβασης:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Θύρα:"
 
@@ -211,11 +209,6 @@ msgstr "_Θύρα:"
 msgid "_Server:"
 msgstr "_Εξυπηρετητής:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "Όν_ομα χρήστη:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -224,18 +217,16 @@ msgstr "<b>Διάφορα</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Προσωπικές πληροφορίες</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Λογαριασμός"
 
@@ -244,25 +235,24 @@ msgid "Account Modification"
 msgstr "Τροποποίηση λογαριασμού"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Λίστα διαχειριστών"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Αλλα_γή κωδικού πρόσβασης"
 
@@ -279,37 +269,35 @@ msgstr ""
 "διακομιστή, και ότι με αυτή την επιλογή απενεργοποιείται το TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Επιλογή _κλειδιού..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Σύνδεση"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -317,17 +305,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Γενικά"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Εξυπηρετητής:"
 
@@ -352,7 +337,6 @@ msgstr ""
 "διακοπή της σύνδεσης"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -362,7 +346,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -372,7 +355,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -388,43 +370,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Κανένα"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Προσωπικές πληροφορίες"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Θύρα: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Π_ροτεραιότητα:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -436,7 +420,7 @@ msgstr ""
 "μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
@@ -445,13 +429,13 @@ msgid "Proxy:"
 msgstr "Μεσολαβητής:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "_Πόρος: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -467,30 +451,25 @@ msgstr ""
 "(βλέπε και πιο κάτω)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Αποθήκευση _φράσης πρόσβασης (περιορισμένη ασφάλεια)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -501,22 +480,17 @@ msgid "Use _SSL (legacy)"
 msgstr "Χρήση _SSL (για λόγους συμβατότητας)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 #, fuzzy
 msgid "_Adjust to status"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Όνομα:"
 
@@ -525,31 +499,38 @@ msgstr "_Όνομα:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Αδυναμία φόρτωσης"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Χρήση πιστοποίησης"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Ε-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ενεργοποίηση"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Όνομα:"
 
@@ -559,7 +540,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -567,56 +547,96 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Επώνυμο:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Συ_γχώνευση λογαριασμών"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Αποστολή πακέτων keep-alive"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Χρήση προσαρμοσμένης θύρας:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Τροποποίηση προσωπικών πληροφοριών..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Ενεργοποίηση"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Εξυπηρετητής:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Διαχείριση..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Θύρα:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Λογαριασμός:"
@@ -810,7 +830,7 @@ msgid "All statuses"
 msgstr "Όλες οι καταστάσεις"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
@@ -827,7 +847,7 @@ msgid "Have "
 msgstr "Έχει"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Αφανής"
 
@@ -836,7 +856,7 @@ msgid "Launch a command"
 msgstr "Εκτέλεση εντολής"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
@@ -957,7 +977,7 @@ msgstr "Τελευταία τροποποίηση:"
 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
 #, fuzzy
 msgid "You have received new entry:"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
@@ -1006,11 +1026,21 @@ msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Εισάγετε το νέο μήνυμα κατάστασης</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Ενεργό"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Δωμάτιο:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Προκαθορισμένα μηνύματα:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Αποθήκευση ως προκαθορισμένο..."
 
@@ -1073,11 +1103,11 @@ msgstr "_Προσθήκη στη λίστα επαφών"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Ιστορικό"
 
@@ -1192,7 +1222,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -1229,7 +1259,7 @@ msgstr ""
 "Επαφή\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Έντονα"
 
@@ -1249,11 +1279,11 @@ msgstr "Προσαρμογή θεμάτων Gajim"
 msgid "Gone"
 msgstr "Έξω"
 
-#: ../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 "Ανενεργό"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Πλάγια"
 
@@ -1304,7 +1334,7 @@ msgstr "Αλλαγή _θέματος"
 msgid "Configure _Room..."
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
@@ -1339,23 +1369,37 @@ msgstr "_Διαχειριστής"
 msgid "_Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Μέλος"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Αποστολή προσωπικού μηνύματος"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Φωνή"
 
@@ -1364,13 +1408,13 @@ msgstr "_Φωνή"
 msgid "Create new post"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Από"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Θέμα"
 
@@ -1396,7 +1440,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
 
-#: ../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 "Διαγραφή"
 
@@ -1421,7 +1466,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Αναζήτηση στη βάση δεδομένων"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Ιστορικό συζητήσεων"
 
@@ -1442,7 +1487,7 @@ msgstr "Αναζήτηση"
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
@@ -1470,8 +1515,8 @@ msgstr "Πρόσφατα:"
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
@@ -1501,7 +1546,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Εμφάνιση κατάστασης:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
@@ -1536,32 +1581,51 @@ msgstr "<b>Ρυθμίσεις</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "Σύνδεση HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Όνομα:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Κωδικός πρόσβασης:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Τύπος:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Μεσολαβητής:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Χρήση πιστοποίησης"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Θύρα:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "Ε_ξυπηρετητής:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Χρήση μεσολαβητή"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Χρήση πιστοποίησης"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "Διεύ_θυνση:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Τύπος:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "Όν_ομα χρήστη:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1601,17 +1665,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Αποστολή"
 
@@ -1718,10 +1787,14 @@ msgstr ""
 "απασχολ./αφανής"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1735,21 +1808,21 @@ msgstr ""
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1758,34 +1831,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1796,7 +1869,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1806,7 +1879,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1814,12 +1887,12 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1828,26 +1901,26 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1855,7 +1928,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1863,7 +1936,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1871,7 +1944,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1879,7 +1952,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1887,14 +1960,14 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1905,20 +1978,20 @@ msgstr ""
 "ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1928,13 +2001,13 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1942,215 +2015,231 @@ msgstr ""
 "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
 "':)' με τις αντίστοιχες γραφικές φατσούλες"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Παρά_θυρο ενός μηνύματος:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Προβολή τίτλου στο κουμπί"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Πάγωσε"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "_Θέμα:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 #, fuzzy
 msgid "Use system _default"
 msgstr "Χρήση _προκαθορισμένου χρώματος"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Φατσούλες:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Διαχειριστής αρχείων:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Εφαρμογή αλληλογραφίας:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Ε_ξερχόμενο μήνυμα:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -2203,7 +2292,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Σειρά:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr ""
 
@@ -2273,127 +2362,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Ήχοι</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Τμήμα:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Ε-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Επιπλέον διεύθυνση:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Οικογένεια:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Ιστορικό</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "<b>Ιστορικό</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Ιστορικό</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Ψευδώνυμο:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Τηλέφωνο:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Συνθήκες</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Τ.Κ.:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Ιδιότητες</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Ιστορικό</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Ήχοι</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Περί"
 
@@ -2403,17 +2492,17 @@ msgstr ""
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Προσωπικές πληροφορίες"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Δουλειά"
 
@@ -2431,8 +2520,8 @@ msgstr "Αφαίρεση λογαριασμού από το Gajim και από
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Αφαίρεση"
 
@@ -2458,7 +2547,7 @@ msgstr "Επεξεργασία _ομάδων"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
@@ -2466,7 +2555,7 @@ msgstr "Αδυναμία εκτέλεσης της εντολής:"
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
@@ -2478,7 +2567,7 @@ msgstr "_Αφαίρεση"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
@@ -2506,12 +2595,6 @@ msgstr "Έναρξη _συζήτησης"
 msgid "_Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
@@ -2536,17 +2619,35 @@ msgstr "_Μετονομασία"
 msgid "_Subscription"
 msgstr "_Συνδρομή"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "εννιά"
 
+#: ../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 "Διαγραφή"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2576,59 +2677,64 @@ msgstr "Όνομα προφίλ:"
 
 #: ../data/glade/roster_window.glade.h:9
 #, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+
+#: ../data/glade/roster_window.glade.h:10
+#, fuzzy
 msgid "Show Trans_ports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Λογαριασμοί"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_Συχνές ερωτήσεις"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Αποστολή μονού _μηνύματος"
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Προβολή"
 
@@ -2647,12 +2753,12 @@ msgid "_Add contact"
 msgstr "Προσθήκη _επαφής"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
@@ -2744,10 +2850,6 @@ msgstr "Αίτηση εγγραφής"
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2773,10 +2875,6 @@ msgstr "Αποστολή ενός _μηνύματος"
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Εμφάνιση _λίστας επαφών"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Κατάσ_ταση"
@@ -2796,55 +2894,60 @@ msgstr "<b>Ιστορικό</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Ρυθμίσεις</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Πόρος:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Περιγραφή</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Επικοινωνία"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Επιλογή Εικόνας"
@@ -2857,6 +2960,11 @@ msgstr "<b>Κίνηση Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Είσοδος δεδομένων XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Ενεργοποίηση"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2885,13 +2993,13 @@ msgstr "Ανάθεση κλειδιού Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
@@ -2915,30 +3023,26 @@ msgstr "Πόρος:"
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Επεξεργασία λογαριασμού"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Πληροφορίες επαφής"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2963,7 +3067,7 @@ msgstr "Ακέραιος"
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Χρώμα"
 
@@ -2988,227 +3092,264 @@ msgstr "(Κενή)"
 msgid "Hidden"
 msgstr "Μυστικό"
 
+#: ../src/atom_window.py:110
+#, fuzzy, 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Αγγλικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Βουλγαρικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Τσέχικα"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Εληνικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Βρετανικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Εσπεράντο"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Ισπανικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Γαλλικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Κροατικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Ιταλικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Νορβηγικά (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Ολλανδικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Νορβηγικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Πολωνέζικα"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Πορτογαλικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Πορτογαλικά Βραζιλίας"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Ρώσικα"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Γερμανικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Σλοβάκικα"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Σουηδικά"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "Υπογράμμιση"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Ψευδώνυμο"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Γραμματοσειρά:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Πληροφορίες επαφής"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
+
+#: ../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
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "Αριθμός - Καλλιτέχνης - Τίτλος"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
@@ -3216,33 +3357,33 @@ msgstr "Χρήση πιστοποίησης"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3251,67 +3392,67 @@ msgstr ""
 "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, fuzzy, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Χρήση: /%s, αποκρύπτει τα κουμπιά της κουβέντας."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3319,169 +3460,181 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Αλλαγή πληροφοριών κατάστασης"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Αλλαγή κατάστασης"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Ελεύθερος για κουβέντα"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Μην ενοχλείτε"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Περιγραφή παρουσίας:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Η κατάσταση άλλαξε."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 #, fuzzy
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
@@ -3490,85 +3643,85 @@ msgstr ""
 "συμπτυχθεί"
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:121
+#: ../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:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Τα ζεύγη * / _ είναι χαρακτήρες μορφοποίησης."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:128
+#: ../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:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:138
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3576,12 +3729,12 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3589,11 +3742,11 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3602,13 +3755,13 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγχθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3616,28 +3769,28 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:182
+#: ../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:184
+#: ../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:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3646,7 +3799,7 @@ msgstr ""
 "Να γίνεται πάντα ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3655,7 +3808,13 @@ msgstr ""
 "Να μην γίνεται ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής "
 "κουβέντας για αυτά τα δωμάτια (jids χωρισμένα με κενά)."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3664,34 +3823,28 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3699,19 +3852,19 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3720,13 +3873,13 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3735,7 +3888,7 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3744,11 +3897,11 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3756,7 +3909,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3766,7 +3919,7 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3775,28 +3928,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3805,7 +3958,7 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3816,7 +3969,7 @@ msgstr ""
 "δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3835,51 +3988,51 @@ msgstr ""
 "'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:250
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3887,145 +4040,165 @@ msgid ""
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../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:256
+#: ../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:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../src/common/config.py:260
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../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:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4034,120 +4207,126 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'ναι', 'όχι', ή 'και τα δύο'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 "'ναι', 'όχι' ή ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4156,150 +4335,180 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Λάθος διακομιστής"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Η δημοσιοποίηση της vCard απέτυχε"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Μη έγκυρο Jabber ID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Δεν είστε στη λίστα μελών."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4310,273 +4519,283 @@ msgstr ""
 "jabberstudio.org για να το αφαιρέσετε"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Δε δόθηκε φράση πρόσβασης για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr ""
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Η σύνδεση απέτυχε"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Αποθηκεύτηκε στο: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4585,19 +4804,30 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Επαφές"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Παρατηρητές"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Μεταφορές"
 
@@ -4607,11 +4837,11 @@ msgid "Not in roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
 
@@ -4644,1361 +4874,1316 @@ msgstr ""
 "Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
 "Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "δώδεκα"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "ένα"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "δύο"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "τρία"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "τέσσερα"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "πέντε"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "έξι"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "επτά"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "οκτώ"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "εννιά"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "δέκα"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "έντεκα"
 
+#. 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 "δώδεκα"
+msgid "%(0)s o'clock"
+msgstr "%(0)s ακριβώς"
 
-#. 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 ακριβώς"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 και πέντε"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s και πέντε"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 και δέκα"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s και δέκα"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 και τέταρτο"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s και τέταρτο"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 και είκοσι"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s και είκοσι"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 και εικοσιπέντε"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s και εικοσιπέντε"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 και μισή"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s και μισή"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$1 παρά εικοσιπέντε"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(1)s παρά εικοσιπέντε"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "$1 παρά είκοσι"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "%(1)s παρά είκοσι"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "$1 παρά τέταρτο"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "%(1)s παρά τέταρτο"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "$1 παρά δέκα"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "%(1)s παρά δέκα"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "$1 παρά πέντε"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "%(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 "Νύχτα"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Νωρίς το πρωί"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Πρωί"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Σχεδόν μεσημέρι"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Μεσημέρι"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Απόγευμα"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Απόγευμα"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Αργά το απόγευμα"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Αρχή εβδομάδας"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Μέση της εβδομάδας"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Τέλος εβδομάδας"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Μέλος"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Λογαριασμός gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "για το λογαριασμό %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Παύση"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Έντονα"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Έχει"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Συζητήσεις"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Έντονα"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Περιεχόμενα"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Περιεχόμενα"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Ανενεργό"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Διαγραφή"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 #, fuzzy
 msgid "Envious"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Excited"
 msgstr "Ενεργό"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Ομάδα"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "Ε_ξυπηρετητής:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "μήνυμα"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ενεργό"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Αφανής"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "ένα"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "Ε_ξυπηρετητής:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Γερμανικά"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Τροποποίηση"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 #, fuzzy
 msgid "Nervous"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Ομάδα"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "έντεκα"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Πάγωσε"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Τελευταία τροποποίηση:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Serious"
 msgstr "_Πίσω"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Οδός:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Χρόνος"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "Υπογράμμιση"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Λάθος διακομιστής"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Απόγευμα"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Σύνθεση"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Πρωί"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "όλους στην ομάδα"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Απόγευμα"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Συμμετοχή"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "Από"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Relaxing"
 msgstr "λιτό"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Αιτία"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Αιτία"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Τρώω"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Μεταφέρεται"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Σύνθεση"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "On a Plane"
 msgstr "Συνδεδεμένος"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Σύνθεση"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Δουλειά"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Σφάλμα avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Δεν ήταν δυνατή η εκκίνηση της τοπικής υπηρεσίας"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Απενεργοποιημένο"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Ενεργό"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Γεγονός"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Λήφθηκε το πρώτο μήνυμα"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Επόμενο μήνυμα ελήφθη"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Επόμενο μήνυμα ελήφθη"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Σύνδεση επαφής"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Αποσύνδεση επαφής"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Το μήνυμα στάλθηκε"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Επισήμανση "
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
-
-#: ../src/config.py:1062
-#, fuzzy
-msgid "GMail Email Received"
-msgstr "Αντιγραφή διεύθυνσης email"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Όνομα"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6006,153 +6191,148 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Διαχείριση λογαριασμών"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Μη έγκυρο Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6160,11 +6340,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6172,11 +6352,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6185,11 +6365,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6197,14 +6377,15 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Μπορεί να είναι ένα από τα παρακάτω:\n"
 "1. χρήστης@τομέας/πόρος (ταιρίαζει μόνο αυτός ο πόρος).\n"
@@ -6213,90 +6394,95 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε το σελιδοδείκτη."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr ""
-"Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
-"λογαριασμού."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Διπλότυπο αναγνωριστικό Jabber"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6307,27 +6493,36 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr ""
+"Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
+"λογαριασμού."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6337,7 +6532,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6345,31 +6540,74 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Ενεργό"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Γεγονός"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Λήφθηκε το πρώτο μήνυμα"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Επόμενο μήνυμα ελήφθη"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Επόμενο μήνυμα ελήφθη"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Σύνδεση επαφής"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Αποσύνδεση επαφής"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Το μήνυμα στάλθηκε"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Επισήμανση "
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
+
+#: ../src/config.py:3666
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Αντιγραφή διεύθυνσης email"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6378,76 +6616,76 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Έξοδος"
+
+#: ../src/conversation_textview.py:709
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Ένα πρόγραμμα για το Jabber"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6462,42 +6700,42 @@ msgstr "Όνομα εικονιδίου"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID συστήματος:"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Ταυτότητα κλειδιού"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ορισμός MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για κατάσταση %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6505,108 +6743,108 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Αποθήκευση ως προκαθορισμένο μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Εισάγετε ένα όνομα για αυτό το μήνυμα κατάστασης"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 #, fuzzy
 msgid "AIM Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 #, fuzzy
 msgid "GG Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 #, fuzzy
 msgid "ICQ Number:"
 msgstr "Αριθμός χώρων εργασίας:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 #, fuzzy
 msgid "MSN Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Αντιγραφή διεύθυνσης email"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Τέλος, θα θέλαμε να ευχαριστήσουμε όλους τους διαχειριστές πακέτων."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -6614,7 +6852,7 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6623,102 +6861,102 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr ""
+"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr ""
-"Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../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 ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:1955
+#: ../src/dialogs.py:2180
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6728,279 +6966,304 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Από %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:2568
+#. 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 "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Προσθήκη"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Τροποποίηση"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Ομάδα"
+
+#. 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 "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
+
+#: ../src/dialogs.py:3029
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Κατάσταση"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "όταν είμαι"
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7008,38 +7271,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7049,58 +7312,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Άλλα"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7108,319 +7371,344 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Εκτέλεση εντολής..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
+"κεντρικό παράθυρο."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Εντολές: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Τροποποίηση λογαριασμού"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "Αδυναμία φόρτωσης"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Κρυπτογράφηση OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "_Εισερχόμενο μήνυμα:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Γενικά"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Χαρακτηριστικά διακομιστή"
@@ -7450,7 +7738,7 @@ msgstr "Mέγεθος: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "You"
 
@@ -7460,7 +7748,7 @@ msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
@@ -7494,27 +7782,27 @@ msgstr "Μήνυμα σφάλματος: %s"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Η μεταφορά αρχείου σταμάτησε από την επαφή της άλλης πλευράς"
+msgid "File transfer stopped"
+msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
@@ -7534,12 +7822,12 @@ msgstr "Περιγραφή: %s"
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
@@ -7547,22 +7835,22 @@ msgstr ""
 "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
 "αντικαταστήσετε."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Τι θέλετε να κάνετε;"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
@@ -7598,52 +7886,52 @@ msgstr "Αρχείο:"
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Η libglade λείπει από το GTK+"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7652,22 +7940,22 @@ msgstr ""
 "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
 "τελευταία σταθερή έκδοση από %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
 "υποστήριξη για την libglade."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Το Gajim χρειάζεται την pywin32 για να εκτελεστεί"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7675,11 +7963,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7687,25 +7975,34 @@ msgstr ""
 "Φαίνεται πως εκτελείται ήδη μια διεργασία του Gajim.\n"
 "Σίγουρα να εκτελεστεί;"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7715,147 +8012,183 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/gajim.py:571
+#: ../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 "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Αίτηση εγγραφής"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Εγγραφή"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 είναι τώρα %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "Μη_ν με ξαναρωτήσεις"
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Έχετε %d νέο μήνυμα ηλεκτρονικής αλληλογραφίας"
 msgstr[1] "Έχετε %d νέα μηνύματα ηλεκτρονικής αλληλογραφίας"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7865,85 +8198,95 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 #, fuzzy
 msgid "Error."
 msgstr "Σφάλμα:"
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7951,31 +8294,31 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Σύνδεση"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
@@ -7984,103 +8327,79 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "Μη_ν με ξαναρωτήσεις"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
-
-#: ../src/gajim.py:3001
-#, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
-"κεντρικό παράθυρο."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "εμφανίζει βοήθεια για μια συγκεκριμένη εντολή"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "εντολή"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "εμφάνιση βοήθειας στην εντολή"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Εμφάνιση ενός παραθύρου με το επόμενο αδιάβαστο μήνυμα"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8089,49 +8408,50 @@ msgstr ""
 "Εμφανίζει όλες τις επαφές στη λίστα επαφών. Κάθε επαφή εμφανίζεται σε μια "
 "ξεχωριστή γραμμή"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "λογαριασμός"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "εμφάνιση μόνο των επαφών του συγκεκριμένου λογαριασμού"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Εμφανίζει τη λίστα των καταχωρημένων λογαριασμών"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Αλλάζει την κατάσταση ενός ή πολλών λογαριασμών"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "κατάσταση"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "μήνυμα"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "μήνυμα κατάστασης"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8140,23 +8460,27 @@ msgstr ""
 "δοκιμάστε να αλλάξετε την κατάσταση όλων των λογαριασμών που έχουν "
 "ενεργοποιημένη την επιλογή \"συγχρονισμός με τη γενική κατάσταση\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Εμφανίζει το διαλόγο κουβέντας ώστε να μπορείτε να στέλνετε μηνύματα σε μια "
 "επαφή"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "εάν έχει καθοριστεί, η επαφή λαμβάνεται από την λίστα επαφών αυτού του "
 "λογαριασμού"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8168,31 +8492,31 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "κλειδί pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "εάν καθοριστεί, το μήνυμα θα κρυπτογραφηθεί χρησιμοποιώντας αυτό το δημόσιο "
 "κλειδί"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "εάν οριστεί, το μήνυμα θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8204,221 +8528,226 @@ msgstr ""
 "'λογαριασμό', χωρίς το 'κλειδί OpenPGP', απλώς θέστε το 'κλειδί OpenPGP' σε "
 "''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "θέμα"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "θέμα μηνύματος"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "το JID της επαφής που θα λάβει το μήνυμα"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Λήψη αναλυτικών πληροφοριών για μία επαφή"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "το JID της επαφής"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Λήψη αναλυτικών πληροφοριών για ένα λογαριασμό"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Όνομα λογαριασμού"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "αρχείο"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "εάν οριστεί, το αρχείο θα σταλεί χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Εμφανίζει όλες τις προτιμήσεις και τις τιμές τους"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Καταχωρεί την 'τιμή' στην τιμή του 'κλειδιού'"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "κλειδί=τιμή"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "Το 'κλειδί' είναι το όνομα της προτίμησης, ενώ 'τιμή' είναι η τιμή που του "
 "έχει προσδιοριστεί"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Διαγράφει μια προτίμηση"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "κλειδί"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "όνομα της προτίμησης που πρόκειται να διαγραφεί"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Γράφει την τρέχουσα κατάσταση των προτιμήσεων του Gajim στο .config αρχείο"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Προσθέτει μια νέα επαφή σε αυτό το λογαριασμό."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Εμφανίζει την τρέχουσα κατάσταση (τη γενική. εκτός εάν έχει προσδιοριστεί "
 "λογαριασμός)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Αναφέρει τον αριθμό των μη αναγνωσμένων μηνυμάτων"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 #, fuzzy
 msgid "Opens 'Start Chat' dialog"
 msgstr "Άνοιγμα του διαλόγου 'Έναρξη κουβέντας'"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Έναρξη κουβέντας με χρήση αυτού του λογαριασμού"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 #, fuzzy
 msgid "Sends custom XML"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 #, fuzzy
 msgid "XML to send"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 #, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 #, fuzzy
 msgid "uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "περιεχόμενα μηνύματος"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Σύνδεση σε νέο δωμάτιο"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Δωμάτιο:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "κωδικός πρόσβασης"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8427,31 +8756,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8460,7 +8789,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8469,7 +8798,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8478,7 +8807,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
@@ -8497,178 +8826,181 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "όνομα θέματος"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντος θέματος"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Μη έγκυρο όνομα χρήστη"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Δεν βρέθηκε το ψευδώνυμο: %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 ""
 "Χρήση: /%s <ψευδώνυμο|JID> [λόγος], απαγορεύει το JID από το δωμάτιο. Το "
 "ψευδώνυμο του χρήστη μπορεί να αντικατασταθεί, αλλά όχι εάν περιέχει \"@\". "
 "Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 "υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8677,7 +9009,7 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8686,7 +9018,7 @@ msgstr ""
 "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
 "λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8695,7 +9027,7 @@ msgstr ""
 "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
 "προαιρετικά και λόγο."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8704,17 +9036,16 @@ msgstr ""
 "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
 "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1683
+#: ../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 ""
 "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
 "δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8723,22 +9054,22 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
 "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8746,61 +9077,75 @@ msgstr ""
 "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
 "εντολές."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
+
+#: ../src/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -8831,17 +9176,17 @@ msgstr "<b>Λεπτομέρειες</b>"
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. 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 ""
@@ -8849,62 +9194,62 @@ msgstr ""
 "συνεδριών"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:733
+#: ../src/gtkgui_helpers.py:728
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../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 ""
 "Η εικόνα δεν είναι δυνατό να αποθηκευτεί στη μορφή %(type)s. Να αποθηκευτεί "
 "ως %(new_filename)s;"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Επαφές"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Ημερομηνία"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8912,7 +9257,7 @@ msgstr ""
 "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
 "ΤΡΕΧΕΙ)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8926,16 +9271,16 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] ""
@@ -8943,167 +9288,177 @@ msgstr[0] ""
 msgstr[1] ""
 "Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:585
+#: ../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] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 msgstr[1] "Θέλετε σίγουρα να διαγράψετε τα επιλεγμένα μηνύματα;"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Ιστορικό κουβέντας με τον %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 #, fuzzy
 msgid "Disk Error"
 msgstr "Σφάλμα:"
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "Ο/Η %(nick)s είναι τώρα %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Συζητήσεις"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Μηνύματα"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Νέο προσωπικό μήνυμα από το δωμάτιο %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Γενικά"
+msgid "Ignore"
+msgstr "εννιά"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 #, fuzzy
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 #, fuzzy
 msgid "Information received"
 msgstr "Περισσότερες πληροφορίες..."
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 #, fuzzy
 msgid "Sending profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 #, fuzzy
 msgid "Information NOT published"
 msgstr "Δεν ήταν δυνατή η εκτέλεση του \"%s\""
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9111,53 +9466,47 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9165,15 +9514,28 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%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 "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9182,19 +9544,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9203,12 +9565,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9218,54 +9580,59 @@ msgstr ""
 "μεταφορά."
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9274,12 +9641,12 @@ msgstr ""
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9287,17 +9654,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9306,27 +9673,27 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9334,158 +9701,159 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3786
+#: ../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 "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 msgstr[1] "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Αποστολή %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "με χρήση του λογαριασμού %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "/Προβολή/_Διαχείριση"
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Ενεργό"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
@@ -9502,20 +9870,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Θέμα: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9525,7 +9893,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9535,130 +9903,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID συστήματος:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:335
+#: ../src/tooltips.py:334
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr "από τις %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Σύνδεση"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Δωμάτιο:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Ενεργό"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Τύπος:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../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"
@@ -9674,17 +10032,22 @@ msgstr "?Πελάτης: Άγνωστος"
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Πελάτης: Άγνωστος"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9692,7 +10055,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9700,12 +10063,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9713,20 +10076,80 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Κρυπτογράφηση OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των "
+#~ "διακομιστών του jabber"
+
+#~ msgid "Servers Features"
+#~ msgstr "Χαρακτηριστικά διακομιστή"
+
+#~ msgid "Your JID:"
+#~ msgstr "Το JID σας:"
+
+#~ msgid "Name:"
+#~ msgstr "Όνομα:"
+
+#~ msgid "_Host:"
+#~ msgstr "Ε_ξυπηρετητής:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Εμφάνιση _λίστας επαφών"
+
+#~ msgid "Modify Account"
+#~ msgstr "Επεξεργασία λογαριασμού"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "Αριθμός - Καλλιτέχνης - Τίτλος"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Λογαριασμός gajim %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Διπλότυπο αναγνωριστικό Jabber"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Αυτός ο λογαριασμός έχει ήδη στηθεί στο Gajim."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Η μεταφορά αρχείου σταμάτησε από την επαφή της άλλης πλευράς"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Γενικά"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Ενεργό"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr ""
@@ -9758,9 +10181,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "_Retype Password:"
 #~ msgstr "Επανά_ληψη κωδικού:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Χρήση μεσολαβητή"
-
 #, fuzzy
 #~ msgid ""
 #~ "If you have 2 or more accounts and this is checked, Gajim will list all "
@@ -9898,9 +10318,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Προχωρημένος έλεγχος ειδοποιήσεων..."
 
-#~ msgid "_Font:"
-#~ msgstr "_Γραμματοσειρά:"
-
 #~ msgid "_Never"
 #~ msgstr "_Ποτέ"
 
@@ -9913,9 +10330,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "_Pop it up"
 #~ msgstr "_Εμφάνισε το"
 
-#~ msgid "_URL:"
-#~ msgstr "Διεύ_θυνση:"
-
 #~ msgid "Address"
 #~ msgstr "Διεύθυνση"
 
@@ -10054,9 +10468,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Προσθήκη %s στην ομάδα %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
-
 #, fuzzy
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Αποκρύπτει τα κουμπιά στο παράθυρο προσωπικού διαλόγου"
@@ -10088,9 +10499,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgstr[0] "%d μη αναγνωσμένο προσωπικό μήνυμα"
 #~ msgstr[1] "%d μη αναγνωσμένα προσωπικά μηνύματα"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Η σύνδεση με το διακομιστή δεν ήταν εφικτή."
 
@@ -10113,9 +10521,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "_Account:"
 #~ msgstr "_Λογαριασμός:"
 
-#~ msgid "Add"
-#~ msgstr "Προσθήκη"
-
 #~ msgid "Away "
 #~ msgstr "Απομακρυσμένος"
 
@@ -10143,9 +10548,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Μη έγκυρο δωμάτιο ή όνομα διακομιστή"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
 
@@ -10274,10 +10676,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "%s has sent you a new message."
 #~ msgstr "Ο/Η %s σας έστειλε ένα νέο μήνυμα."
 
-#, fuzzy
-#~ msgid "GUI Migration failed"
-#~ msgstr "Η δημοσιοποίηση της vCard απέτυχε"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Το ιστορικό έχει μεταφερθεί στη βάση δεδομένων με επιτυχία."
 
@@ -10338,9 +10736,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "account: "
 #~ msgstr "λογαριασμός: "
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά το δωμάτια."
 
diff --git a/po/en_GB.po b/po/en_GB.po
index d5a887921..5e5643cd2 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,14 +1,14 @@
 # English translations for Gajim - A Jabber Instant Messager package.
 # Copyright (C) 2006 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
-# Jeff Bailes <thepizzaking@gmail.com>, 2006.
 #
+# Jeff Bailes <thepizzaking@gmail.com>, 2006, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 16:14+0100\n"
-"PO-Revision-Date: 2008-12-02 10:09+1100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Jeff Bailes <thepizzaking@gmail.com>\n"
 "Language-Team: English <en_gb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgid "_Add Contact..."
 msgstr "_Add Contact..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Discover Services"
 
@@ -59,7 +59,7 @@ msgid "_Personal Events"
 msgstr "_Personal Events"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Start Chat..."
 
@@ -91,6 +91,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Please select a 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"
@@ -98,59 +102,54 @@ msgstr ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Click to see features (like MSN, ICQ transports) of jabber servers"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Use authentication"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Connect when I press Finish"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Account Creation Wizard"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "I already have an account I want to _use"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "I want to _register for a new account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "If ticked, Gajim will remember the password for this account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Manage..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Save pass_word"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Servers Features"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Set my profile when I connect"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Use custom hostname/port"
 
@@ -163,30 +162,31 @@ msgstr ""
 "to the Jabber network."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Your JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Finish"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Hostname:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Password:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -194,11 +194,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Username:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -207,18 +202,16 @@ msgstr "<b>Miscellaneous</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personal Information</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Account"
 
@@ -227,23 +220,22 @@ msgid "Account Modification"
 msgstr "Account Modification"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administration operations"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Auto-reconnect when connection is lost"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnect on Gajim startup"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Chan_ge Password"
 
@@ -260,37 +252,35 @@ msgstr ""
 "be disabled"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Choose _Key..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Click to change account's password"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Click to request authorisation to all contacts of another account"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Connection"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Edit Personal 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:514 ../src/notify.py:545
-#: ../src/notify.py:557
+#: ../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"
 
@@ -298,17 +288,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2672
-#: ../src/roster_window.py:5157
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "General"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Hostname: "
 
@@ -331,7 +318,6 @@ msgstr ""
 "which results in disconnection"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -341,7 +327,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -351,7 +336,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -367,43 +351,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Information about you, as stored in the server"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "No key selected"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2741
-#: ../src/roster_window.py:2747 ../src/roster_window.py:2752
+#: ../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 "None"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personal Information"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_ty:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -414,7 +400,7 @@ msgstr ""
 "client with the highest priority gets the events"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Priority will change automatically according to your status."
 
@@ -423,12 +409,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Resour_ce:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -443,30 +429,25 @@ msgstr ""
 "has the highest priority will get the events. (see below)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Save _passphrase (insecure)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Save conversation _logs for all contacts"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Send keep-alive packets"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronise account status with global status"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Synchronise contacts"
@@ -476,21 +457,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Use _SSL (legacy)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Use file transfer proxies"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Adjust to 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:13
 msgid "_Name:"
 msgstr "_Name:"
 
@@ -498,11 +474,21 @@ msgstr "_Name:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Adjust to status"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Use authentication"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -510,21 +496,18 @@ msgstr ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnect on Gajim startup"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Enable"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "First Name:"
 
@@ -533,7 +516,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "If ticked, Gajim will get the password from a GPG agent like seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -544,56 +526,98 @@ msgstr ""
 "You might consider to change possible firewall settings."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:679
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Surname:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Mer_ge accounts"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5108
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_name"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Send keep-alive packets"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Synch_ronise account status with global status"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Use GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Use custom hostname/port"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Use custom port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Edit Personal Information..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Enable"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Hostname:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Manage..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Warn before using an insecure connection"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "use HTTP_PROXY environment variable"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "use HTTP_PROXY environment variable"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "A_ccount:"
@@ -777,7 +801,7 @@ msgid "All statuses"
 msgstr "All statuses"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Away"
 
@@ -794,7 +818,7 @@ msgid "Have "
 msgstr "Have "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -803,7 +827,7 @@ msgid "Launch a command"
 msgstr "Launch a command"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Not Available"
 
@@ -923,7 +947,7 @@ msgstr "Last modified:"
 msgid "New entry received"
 msgstr "New entry received"
 
-#: ../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 "You have received new entry:"
 
@@ -967,11 +991,19 @@ msgstr "Enter new password:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Type your new status message</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 "Activity:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Mood:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Preset messages:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Save as Preset..."
 
@@ -1006,50 +1038,36 @@ msgstr "_Open Link in Browser"
 msgid "_Start Chat"
 msgstr "_Start Chat"
 
-#. Execute Command
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5694
-msgid "Execute Command..."
-msgstr "Execute Command..."
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
 msgid "Invite _Contacts"
 msgstr "Invite _Contacts"
 
-#. Send Custom Status
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5073 ../src/roster_window.py:5660
-msgid "Send Cus_tom Status"
-msgstr "Send Cus_tom Status"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Send _File"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
 msgstr "Toggle End to End Encryption"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "_Add to Roster"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:8
+#: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5804
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_History"
 
@@ -1157,7 +1175,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Show a pop-up notification when a file transfer is complete "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Continue"
 
@@ -1193,7 +1211,7 @@ msgstr ""
 "Contact row\n"
 "Chat Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:752
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Bold"
 
@@ -1213,11 +1231,11 @@ msgstr "Gajim Themes Customisation"
 msgid "Gone"
 msgstr "Gone"
 
-#: ../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 "Inactive"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:753
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Italic"
 
@@ -1265,7 +1283,7 @@ msgstr "Change _Subject..."
 msgid "Configure _Room..."
 msgstr "Configure _Room..."
 
-#: ../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 "_Bookmark"
 
@@ -1297,23 +1315,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Ban"
 
-#: ../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 "_Block"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kick"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Member"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Owner"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Send Private Message"
 
-#: ../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 "_Unblock"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voice"
 
@@ -1321,13 +1353,13 @@ msgstr "_Voice"
 msgid "Create new post"
 msgstr "Create new post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "From"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Subject"
 
@@ -1345,7 +1377,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Welcome to Gajim History Logs Manager</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 "Delete"
 
@@ -1398,7 +1431,7 @@ msgstr "Search:"
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
@@ -1425,8 +1458,8 @@ msgstr "Recently:"
 msgid "Room:"
 msgstr "Room:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
-#: ../src/disco.py:1620
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Join"
 
@@ -1454,7 +1487,7 @@ msgstr "Minimise on Auto Join"
 msgid "Print status:"
 msgstr "Print 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:"
 
@@ -1483,36 +1516,56 @@ msgid "<b>Settings</b>"
 msgstr "<b>Settings</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP Connect\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Manage Proxy Profiles"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Name:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Type:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Use authentication"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Use proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Use authentication"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Username:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1562,7 +1615,7 @@ msgstr "Show the contact's profile (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 "_Send"
 
@@ -1658,10 +1711,14 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Allow pop-up/notifications when I'm _away/na/busy/invisible"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Ask status message when I:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1675,19 +1732,19 @@ msgstr ""
 "Always use Xfce default applications\n"
 "Custom"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Chat message:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Check on startup if Gajim is the _default Jabber client"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Configure colour and font of the interface"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1701,31 +1758,31 @@ msgstr ""
 "Detached roster with chat grouped by account\n"
 "Detached roster with chat grouped by type"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Display _activity of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Display _extra e-mail details"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Display _tunes of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Display a_vatars of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Display m_ood of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Display status _messages of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1735,7 +1792,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1745,7 +1802,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1753,11 +1810,11 @@ msgstr ""
 "Gajim will notify you via a pop-up window in the bottom right of the screen "
 "about contacts that just signed out"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Hide all buttons in chat windows"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1765,7 +1822,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1773,13 +1830,13 @@ msgstr ""
 "If ticked, Gajim will also include information about the sender of the new e-"
 "mails"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "If ticked, Gajim will change status to Away when the computer is unused."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1787,7 +1844,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1795,7 +1852,7 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1803,25 +1860,25 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the activity of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the mood of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the tunes of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1831,7 +1888,7 @@ msgstr ""
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1841,7 +1898,7 @@ msgstr ""
 "with caution, because it blocks all messages from any contact that is not in "
 "the roster"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1851,7 +1908,7 @@ msgstr ""
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1859,7 +1916,7 @@ msgstr ""
 "If ticked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1869,7 +1926,7 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1877,7 +1934,7 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1885,43 +1942,50 @@ msgstr ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Log _encrypted chat session"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Ma_ke message windows compact"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Notify on new _GMail email"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Personal Events"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Play _sounds"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1931,19 +1995,24 @@ msgstr ""
 "Notify me about it\n"
 "Show only in roster"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Show event in systray"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Sign _in"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Sign _out"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1951,139 +2020,145 @@ msgstr ""
 "Some messages may include rich content (formatting, colours etc). If ticked, "
 "Gajim will just display the raw message text."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Status _iconset:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_heme:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "The auto not available status message. If empty, Gajim will not change the "
 "current status message"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Use _transports icons"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Use system _default"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "When new event is received:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "_Away after:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Display chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelt words"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignore rich content in incoming messages"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Incoming message:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Log status changes of contacts"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "_Not available after:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Outgoing message:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Reset to Default Colours"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "_Send chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Status message:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_URL highlight:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Window behaviour:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "in _group chats"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "in _roster"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutes"
 
@@ -2131,7 +2206,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2566
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Privacy List"
 
@@ -2196,108 +2271,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Company:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Country:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Department:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-Mail:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Extra Address:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Family:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Full Name</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Given:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Homepage:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Middle:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Name:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Nickname:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Phone No.:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Postal Code:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefix:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Role:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>State:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Street:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffix:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "About"
 
@@ -2307,17 +2382,17 @@ msgstr "Click to set your avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Personal Info"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Work"
 
@@ -2335,8 +2410,8 @@ msgstr "Remove account from Gajim and from _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5145
-#: ../src/roster_window.py:5622 ../src/roster_window.py:5751
+#: ../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 "_Remove"
 
@@ -2356,10 +2431,16 @@ msgstr "Assign Open_PGP Key..."
 msgid "Edit _Groups..."
 msgstr "Edit _Groups..."
 
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5815
+msgid "Execute Command..."
+msgstr "Execute Command..."
+
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5063 ../src/roster_window.py:5575
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_vite to"
 
@@ -2367,6 +2448,12 @@ msgstr "In_vite to"
 msgid "Remo_ve"
 msgstr "Remo_ve"
 
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
+msgid "Send Cus_tom Status"
+msgstr "Send Cus_tom Status"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Send Single _Message..."
@@ -2388,12 +2475,6 @@ msgstr "Start _Chat"
 msgid "_Allow him/her to see my status"
 msgstr "_Allow him/her to see my status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5136 ../src/roster_window.py:5612
-#: ../src/roster_window.py:5741
-msgid "_Block"
-msgstr "_Block"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Forbid him/her to see my status"
@@ -2415,16 +2496,34 @@ msgstr "_Rename..."
 msgid "_Subscription"
 msgstr "_Subscription"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5130 ../src/roster_window.py:5606
-#: ../src/roster_window.py:5738
-msgid "_Unblock"
-msgstr "_Unblock"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Unignore"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Add _Contact..."
@@ -2450,56 +2549,62 @@ msgid "Profile, A_vatar"
 msgstr "Profile, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Show _Offline Contacts"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Show Trans_ports"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Show _Offline Contacts"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
-msgstr "Show _roster"
-
 #: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Show _Roster"
+
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Accounts"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Contents"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1353
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Help"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "_Send Single Message..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_View"
 
@@ -2516,11 +2621,11 @@ msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5763
+#: ../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 "_Search"
 
@@ -2608,10 +2713,6 @@ msgstr "Subscription Request"
 msgid "_Deny"
 msgstr "_Deny"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Select the account with which to synchronise"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Select the account with which you want to synchronise"
@@ -2636,10 +2737,6 @@ msgstr "Send Single _Message"
 msgid "Show All Pending _Events"
 msgstr "Show All Pending _Events"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Show _Roster"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2657,49 +2754,54 @@ msgstr "<b>Ask:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Client:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>State:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resource:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Subscription:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Comments"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Configured avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contact"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Personal Information"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "More"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "User avatar:"
 
@@ -2711,6 +2813,11 @@ msgstr "<b>Jabber Traffic</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Enable"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2739,13 +2846,13 @@ msgstr "Assign Open_PGP Key"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5595
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Edit _Groups"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5721
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Rename"
 
@@ -2769,30 +2876,26 @@ msgstr "Resource:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Modify Account"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Cancel confirmation"
 
-#: ../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 ""
 "You are in process of executing command. Do you really want to cancel it?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Service changed the session identifier."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Service changed the session identifier."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Service returned an error."
 
@@ -2817,7 +2920,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:772
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Colour"
 
@@ -2842,175 +2945,198 @@ msgstr "(None)"
 msgid "Hidden"
 msgstr "Hidden"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "You have received new entry:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:336
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:359 ../src/chat_control.py:555
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:360 ../src/chat_control.py:556
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: ../src/chat_control.py:754
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Undefined"
 
-#: ../src/chat_control.py:755
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Sick"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:796
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:787
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Personal Information"
 
-#: ../src/chat_control.py:1217 ../src/chat_control.py:1620
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Really send file?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "If you send a file to %s, he/she will know your real Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1246 ../src/chat_control.py:2115
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:861
-#: ../src/dialogs.py:904 ../src/gajim.py:980 ../src/gajim.py:1640
-#: ../src/normal_control.py:483 ../src/roster_window.py:915
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:1879 ../src/roster_window.py:3110
-#: ../src/roster_window.py:3134 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5441
+#: ../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 "Not in Roster"
 
-#: ../src/chat_control.py:1378 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "A list of active, completed and stopped file transfers"
+
+#: ../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 "Unknown Artist"
 
-#: ../src/chat_control.py:1380 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: ../src/chat_control.py:1386 ../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"
@@ -3019,26 +3145,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "from <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1391
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-
-#: ../src/chat_control.py:1515
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1600 ../src/dialogs.py:3912
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3046,50 +3163,50 @@ msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:1610
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "and NOT authenticated"
 
 #. 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:1667
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3098,26 +3215,26 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:1715
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Command not supported for zeroconf account."
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Commands: %s"
 
-#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage: /%s, clears the text window."
 
-#: ../src/chat_control.py:1732 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/chat_control.py:1735 ../src/groupchat_control.py:1688
+#: ../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 "
@@ -3126,38 +3243,38 @@ msgstr ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
 "third person. (e.g. /%(command)s explodes.)"
 
-#: ../src/chat_control.py:1740
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Usage: /%s, sends a ping to the contact"
 
-#: ../src/chat_control.py:1743
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, send the message to the contact"
 
-#: ../src/chat_control.py:1746 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "No help info for /%s"
 
-#: ../src/chat_control.py:1878
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:1885
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:1888
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:1895
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3165,25 +3282,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:1897
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:1926 ../src/chat_control.py:1939
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:1932
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "The following message was encrypted"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2303
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2304
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3191,15 +3308,15 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2453 ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1218
-#: ../src/gajim.py:174
+#: ../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 "Database Error"
 
-#: ../src/chat_control.py:2454
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3208,163 +3325,175 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2690
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 will now exit"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
-#: ../src/roster_window.py:5033
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Groupchats"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "You left the following groupchats:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Forward unread messages"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Away as a result of being idle more than $T min)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S will be replaced by current status message, $T by autoaway time."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Time in minutes, after which your status changes to not available."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Not available as a result of being idle more than $T min)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S will be replaced by current status message, $T by autoxa time."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:452
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3128
+#: ../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 "default"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Enable link-local/zeroconf messaging"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3374,7 +3503,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3384,17 +3513,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3404,7 +3533,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3412,7 +3541,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3420,7 +3549,7 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3430,19 +3559,19 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3450,11 +3579,11 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3462,11 +3591,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3475,11 +3604,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3491,13 +3620,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3505,7 +3634,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3513,11 +3642,11 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3525,7 +3654,7 @@ msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3533,7 +3662,13 @@ msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3541,35 +3676,27 @@ msgstr ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-
-#: ../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 "
@@ -3581,17 +3708,17 @@ msgstr ""
 "numbers are more secure, but take longer to calculate when you start a "
 "session."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Preview new messages in notification popup?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../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."
@@ -3599,13 +3726,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../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."
@@ -3613,7 +3740,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3621,11 +3748,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../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 "Define the position of the avatar in roster. Can be left or right"
 
-#: ../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."
@@ -3633,7 +3760,7 @@ msgstr ""
 "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."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3641,7 +3768,7 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../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 "
@@ -3655,29 +3782,29 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../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 ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../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 "
@@ -3687,7 +3814,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3698,7 +3825,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3718,31 +3845,31 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in chat windows."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../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."
@@ -3750,15 +3877,15 @@ msgstr ""
 "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."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3766,11 +3893,11 @@ msgstr ""
 "List of colours, separated by \":\", that will be used to colour nicknames "
 "in group chats."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../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."
@@ -3778,7 +3905,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../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 "
@@ -3788,7 +3915,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3796,7 +3923,16 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3804,7 +3940,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../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"
@@ -3812,7 +3948,7 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../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."
@@ -3820,7 +3956,7 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: ../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."
@@ -3828,11 +3964,11 @@ msgstr ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3840,7 +3976,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3848,11 +3984,11 @@ msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: ../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."
@@ -3860,16 +3996,22 @@ msgstr ""
 "Change the value to change the size of latex formulae displayed. The higher "
 "is larger."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Valid URI schemes. Only schemes in this list will be made accepted as \"real"
 "\" URI."
 
-#: ../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."
@@ -3877,7 +4019,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../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"
@@ -3885,25 +4027,25 @@ msgstr ""
 "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"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "If enabled, restore the last status that was used."
 
-#: ../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 ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Enable ESessions encryption for this account."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: ../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"
@@ -3911,34 +4053,43 @@ msgstr ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: ../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
+#, fuzzy
 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 ""
 "How many seconds to wait for the answer of keepalive packet before we try to "
 "reconnect."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../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."
@@ -3946,19 +4097,27 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../src/common/config.py:393
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3966,101 +4125,101 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:395 ../src/common/config.py:398
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:406 ../src/common/config.py:408
-#: ../src/common/config.py:409 ../src/common/config.py:412
-#: ../src/common/config.py:413
+#: ../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' or ''"
 
-#: ../src/common/config.py:419 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:421 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:423 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:431 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:434 ../src/common/config.py:435
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4068,68 +4227,99 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:459 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Wrong host"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Invalid local address? :-O"
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1845
-#: ../src/common/connection_handlers.py:1891
-#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1216
-#: ../src/gajim.py:396
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Register to %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1219
-#: ../src/gajim.py:175
+#: ../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 "Invalid Jabber ID"
+
+#: ../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: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."
@@ -4138,78 +4328,77 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 
-#: ../src/common/connection_handlers.py:1966
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2041
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:560
+#: ../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 "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from group chat %s."
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: ../src/common/connection_handlers.py:2055
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Room has been destroyed"
 
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4219,213 +4408,218 @@ msgstr ""
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passphrase was not given"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../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 "You will be connected to %s without OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Unable to get issuer certificate"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Unable to get certificate CRL"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Unable to decrypt certificate's signature"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Unable to decrypt CRL's signature"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Unable to decode issuer public key"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Certificate signature failure"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "CRL signature failure"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Certificate is not yet valid"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Certificate has expired"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "CRL is not yet valid"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "CRL has expired"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Format error in certificate's notBefore field"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Format error in certificate's notAfter field"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format error in CRL's lastUpdate field"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format error in CRL's nextUpdate field"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Out of memory"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Self signed certificate"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Self signed certificate in certificate chain"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "Unable to get local issuer certificate"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "Unable to verify the first certificate"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Certificate chain too long"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Certificate revoked"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Invalid CA certificate"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Path length constraint exceeded"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Unsupported certificate purpose"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Certificate not trusted"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Certificate rejected"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "Key usage does not include certificate signing"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s answered wrongly to register request: %(error)s"
 
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Connection to proxy failed"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1351
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1057
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Saved in: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Connection to proxy failed"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account %s has been lost. Retry connecting."
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "The authenticity of the %s certificate could be invalid."
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4434,7 +4628,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4443,24 +4637,24 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4469,25 +4663,30 @@ msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: ../src/common/connection.py:1095
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 "It is not possible to send empty files"
+
+#: ../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 "Neither the remote presence is signed, nor a key was assigned."
 
-#: ../src/common/connection.py:1097
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 "The contact's key (%s) does not match the key assigned in Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1106
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4496,20 +4695,30 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1384
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Invite _Contacts"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
-#: ../src/gajim.py:980
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observers"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:806 ../src/roster_window.py:818
-#: ../src/roster_window.py:1470 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1676
+#: ../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 "Transports"
 
@@ -4518,11 +4727,11 @@ msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
@@ -4551,1043 +4760,1053 @@ msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "twelve"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "one"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "two"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "three"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "four"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "five"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "six"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "seven"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "eight"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nine"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "ten"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "eleven"
 
+#. 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 "twelve"
+msgid "%(0)s o'clock"
+msgstr "%(0)s o'clock"
 
-#. 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 o'clock"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "five past $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "five past %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ten past $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "ten past %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "quarter past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "quarter past %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "twenty past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "twenty past %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "twenty five past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "twenty five past %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "half past $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "half past %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "twenty five to $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "twenty five to %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "twenty to $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "twenty to %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "quarter to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "quarter to %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ten to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "ten to %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "five to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "five to %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 o'clock"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s o'clock"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Night"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Early morning"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morning"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Almost noon"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Noon"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Afternoon"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Evening"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Late evening"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Start of week"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Middle of week"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "End of week"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server address required."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Available"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Available"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "is composing a message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message pending"
 msgstr[1] "%d messages pending"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " from %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d event pending"
 msgstr[1] "%d events pending"
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Error executing \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s is not a valid loglevel"
+
 #. 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 "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim account %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "of account %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Afraid"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Amazed"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Amorous"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Angry"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Annoyed"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Anxious"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Aroused"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Ashamed"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Bored"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Brave"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Calm"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Cautious"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Cold"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Confident"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Confused"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Contemplative"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Contented"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Cranky"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Crazy"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Creative"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Curious"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Dejected"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Depressed"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Disappointed"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Disgusted"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Dismayed"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Distracted"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Embarrassed"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Envious"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Excited"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Flirtatious"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustrated"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Grateful"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Grieving"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Grumpy"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Guilty"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Happy"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Hopeful"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Hot"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Humbled"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Humiliated"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Hungry"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Hurt"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Impressed"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "In Awe"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "In Love"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Indignant"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Interested"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Intoxicated"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Jealous"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Lonely"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Lost"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Lucky"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Mean"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Moody"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nervous"
 
-#: ../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 "Offended"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Outraged"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Playful"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Proud"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Relaxed"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Relieved"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Remorseful"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Restless"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Sad"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarcastic"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Satisfied"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Serious"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Shocked"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Shy"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Sick"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Sleepy"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Spontaneous"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Stressed"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Strong"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Surprised"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Thankful"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Thirsty"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Tired"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Undefined"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Weak"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Worried"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Doing Chores"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Buying Groceries"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Cleaning"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Cooking"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Doing Maintenance"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Doing the Dishes"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Doing the Laundry"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Gardening"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Running an Errand"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Walking the Dog"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Drinking"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Having a Beer"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Having Coffee"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Having Tea"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Having a Snack"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Having Breakfast"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Having Dinner"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Having Lunch"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Exercising"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Cycling"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Dancing"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Hiking"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Jogging"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Playing Sports"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Running"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Skiing"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Swimming"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Working out"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Grooming"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "At the Spa"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Brushing Teeth"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Getting a Haircut"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Shaving"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Taking a Bath"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Taking a Shower"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Having an Appointment"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Day Off"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Hanging out"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Hiding"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "On Vacation"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Praying"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Scheduled Holiday"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Thinking"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Relaxing"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Fishing"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Gaming"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Going out"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Partying"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Reading"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Rehearsing"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Shopping"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Smoking"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Socialising"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Sunbathing"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Watching TV"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Watching a Movie"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Talking"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "In Real Life"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "On the Phone"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "On Video Phone"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Travelling"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Commuting"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Driving"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "In a Car"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "On a Bus"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "On a Plane"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "On a Train"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "On a Trip"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Walking"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Coding"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "In a Meeting"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Studying"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Writing"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Unable to bind to port %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5596,7 +5815,7 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5604,7 +5823,7 @@ msgstr ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5613,16 +5832,16 @@ msgstr ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "To continue sending and receiving messages, you will need to reconnect."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5631,31 +5850,31 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi or Bonjour is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5664,65 +5883,49 @@ msgstr ""
 "sent."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[This message is encrypted]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Your message could not be sent."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Connection to host could not be established: Timeout while sending data."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Active"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Event"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Default Message"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr "Always use OS/X default applications"
-
-#: ../src/config.py:455
-msgid "Custom"
-msgstr "Custom"
-
-#: ../src/config.py:650 ../src/dialogs.py:1200
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5731,105 +5934,69 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "status message text"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "First Message Received"
-
-#: ../src/config.py:1054
-msgid "Next Message Received Focused"
-msgstr "Next Message Received Focused"
-
-#: ../src/config.py:1056
-msgid "Next Message Received Unfocused"
-msgstr "Next Message Received Unfocused"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Contact Connected"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Contact Disconnected"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Message Sent"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Group Chat Message Highlight"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Group Chat Message Received"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "GMail E-mail Received"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
-#: ../src/disco.py:770 ../src/disco.py:1564 ../src/disco.py:1811
-#: ../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 "Name"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1531 ../src/config.py:1630
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5837,144 +6004,139 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1676 ../src/dialogs.py:1812
-#: ../src/dialogs.py:1991 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "You are not connected to the server"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5982,11 +6144,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5994,11 +6156,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6006,11 +6168,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6018,14 +6180,15 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6034,84 +6197,89 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2580 ../src/gajim.py:1429 ../src/roster_window.py:1942
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1916
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1943
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
-msgstr "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Invalid nickname"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "You must provide a username to configure this account."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Nickname not allowed: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Duplicate Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Invalid server"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "This account is already configured in Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Invalid entry"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6121,24 +6289,32 @@ msgstr ""
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3137
-msgid "Invalid server"
-msgstr "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Your new account has been successfully created"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Invalid username"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3138
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Please provide a server on which you want to register."
 
-#: ../src/config.py:3189 ../src/gajim.py:2007
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3190 ../src/gajim.py:2008
+#: ../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 "This certificate is already in file %s, so it's not added again."
 
-#: ../src/config.py:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6153,7 +6329,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3264 ../src/gajim.py:2031
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6164,23 +6340,63 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Your new account has been successfully created"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Active"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Event"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "First Message Received"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Next Message Received Focused"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Next Message Received Unfocused"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Contact Connected"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Contact Disconnected"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Message Sent"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Group Chat Message Highlight"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Group Chat Message Received"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "GMail E-mail Received"
+
+#: ../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"
@@ -6190,7 +6406,7 @@ msgstr ""
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6198,74 +6414,74 @@ msgstr ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 
-#: ../src/conversation_textview.py:692
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Quit"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:704
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:1015 ../src/conversation_textview.py:1033
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Error executing \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1290
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1294
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1328
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber ID already in list"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "The Jabber ID you entered is already in the list. Choose another one."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6280,27 +6496,27 @@ msgstr "Contact name: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Set Mood"
 
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
@@ -6309,114 +6525,114 @@ msgstr "%s Status Message"
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Overwrite Status Message?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "This name is already used. Do you want to overwrite this status message?"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1014
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1020
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1026
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1039
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6429,88 +6645,88 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1605
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "The nickname has not allowed characters."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %(account)s from %(jid)s"
 
-#: ../src/dialogs.py:1608
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1669 ../src/gajim.py:2631
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1696
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:1767
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-msgid "The nickname has not allowed characters."
-msgstr "The nickname has not allowed characters."
-
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s is not the name of a group chat."
 
-#: ../src/dialogs.py:1813
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:1827
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You cannot synchronise with an account unless it is connected."
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:1946
+#: ../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:"
@@ -6519,274 +6735,300 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2346 ../src/dialogs.py:2489
-#: ../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 "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2016
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2056 ../src/notify.py:245 ../src/notify.py:472
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2058 ../src/notify.py:253 ../src/notify.py:474
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#: ../src/dialogs.py:2060 ../src/notify.py:276 ../src/notify.py:476
-#: ../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 "New Message"
 
 #. single message
-#: ../src/dialogs.py:2060 ../src/notify.py:257 ../src/notify.py:476
-#: ../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 "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2061 ../src/notify.py:264 ../src/notify.py:477
-#: ../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 "New Private Message"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1594 ../src/notify.py:485
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1660 ../src/notify.py:479
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1560 ../src/gajim.py:1627
-#: ../src/notify.py:481 ../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 "File Transfer Error"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1702 ../src/gajim.py:1724
-#: ../src/gajim.py:1741 ../src/notify.py:483 ../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 "File Transfer Completed"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1705 ../src/notify.py:483
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2070 ../src/gajim.py:1450 ../src/notify.py:487
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2072 ../src/notify.py:237 ../src/notify.py:489
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2268 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2271 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2294 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2317 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Form %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2389 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2390 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:2560
+#. 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 "I would like to add you to my contact list."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Address"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Moody"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Group"
+
+#. 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 "I would like to add you to my roster."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2564
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:2620
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 
-#: ../src/dialogs.py:2625
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:2667
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:2850
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:2923
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6797,19 +7039,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../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 "
@@ -6819,19 +7061,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../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 "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../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> "
@@ -6846,22 +7088,22 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Did you talk to the remote contact and verify the SAS?"
 
-#: ../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 ""
 "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 
-#: ../src/dialogs.py:3913
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages."
 
-#: ../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."
@@ -6869,7 +7111,7 @@ msgstr ""
 "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."
 
-#: ../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."
@@ -6877,33 +7119,33 @@ msgstr ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6911,217 +7153,239 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1574
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1582
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1590
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1820
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Bookmark already set"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Group Chat \"%s\" is already in your bookmarks."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark has been added successfully"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "You can manage your bookmarks via Actions menu in your roster."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:1828
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1885
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1891
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1897
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "SSL certificate error"
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "A library used to validate server certificates to ensure a secure connection."
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Requires python-pyopenssl."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Serverless chatting with autodetected clients in a local network."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Requires python-avahi."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Commands: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "A script to control Gajim via commandline."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Requires python-dbus."
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 "Feature not available under Windows."
 
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Toggle Open_PGP Encryption"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Encrypting chat messages with gpg keys."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requires gpg and python-GnuPGInterface."
 
-#: ../src/features_window.py:67
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Autodetection of network status."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requires gnome-network-manager and python-dbus."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Session Management"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim session is stored on logout and restored on login."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Requires python-gnome2."
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Password to enter the room"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passwords can be stored securely and not just in plaintext."
 
-#: ../src/features_window.py:77
-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 "Requires gnome-keyring and python-gnome2-desktop."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Ability to connect to servers which are using SRV records."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Requires dnsutils."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Requires nslookup to use SRV records."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Spell Checker"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Spellchecking of composed messages."
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Requires python-sexy."
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Notifications"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Passive popups notifying for new events."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7129,45 +7393,51 @@ msgstr ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Trayicon"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "A icon in systemtray reflecting the current presence."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Requires PyGTK >= 2.10."
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "Idle"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Adjust to status"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Ability to measure idle time, in order to set auto status."
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
+msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Requires python-gnome2."
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transform LaTeX expressions between $$ $$."
 
-#: ../src/features_window.py:101
+#: ../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."
@@ -7175,7 +7445,7 @@ msgstr ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 
-#: ../src/features_window.py:102
+#: ../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."
@@ -7183,23 +7453,25 @@ msgstr ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 
-#: ../src/features_window.py:103
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "End to End Encryption"
 
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Encrypting chatmessages."
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Requires python-crypto."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:108
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7207,23 +7479,23 @@ msgstr ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Requires python-docutils."
 
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Ability to have clickable URLs in chat and groupchat window banners."
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Requires python-sexy."
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Feature"
 
@@ -7252,7 +7524,7 @@ msgstr "Size: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "You"
 
@@ -7262,7 +7534,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Recipient: "
 
@@ -7294,26 +7566,27 @@ msgid "Error message: %s"
 msgstr "Error message: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "File transfer stopped by the contact at the other end"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "File Transfer Stopped"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Description: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
@@ -7333,12 +7606,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
@@ -7346,22 +7619,22 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -7397,48 +7670,52 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:87
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s is not a valid loglevel"
-
-#: ../src/gajim.py:160
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:190
-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 needs PyGTK 2.8 or above"
 
-#: ../src/gajim.py:191
-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 needs PyGTK 2.8 or above to run. Quiting..."
 
-#: ../src/gajim.py:193
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim needs GTK 2.8 or above"
 
-#: ../src/gajim.py:194
-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 needs GTK 2.8 or above to run. Quiting..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime is missing libglade support"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7447,21 +7724,21 @@ msgstr ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 
-#: ../src/gajim.py:208
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:216
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:217
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7471,11 +7748,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:370
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:371
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7483,25 +7760,35 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:497
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "No GPG key assigned"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:513
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gajim.py:514
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7512,50 +7799,59 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gajim.py:575
+#: ../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 "Do you accept this request?"
 
-#: ../src/gajim.py:577
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:628 ../src/notify.py:491 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gajim.py:934 ../src/gajim.py:938
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:948 ../src/gajim.py:962
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:994
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Subscription Request"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:1015
+#: ../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?"
@@ -7563,72 +7859,77 @@ msgstr ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
 
-#: ../src/gajim.py:1056
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Unsubscribe"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:1232 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s is now known as %(new_nick)s"
 
-#: ../src/gajim.py:1250 ../src/groupchat_control.py:1339
-#: ../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 is now %(status)s"
 
-#: ../src/gajim.py:1313
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s has set the subject to %(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:1377 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Room now shows unavailable member"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "A non-privacy-related room configuration change has occurred"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: ../src/gajim.py:1430
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A Password is required to join the room %s. Please type it."
 
-#: ../src/gajim.py:1464
+#: ../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"
@@ -7636,27 +7937,55 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gajim.py:1571
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG is not usable"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages."
+
+#: ../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 "Do _not ask me again"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
+"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "You have %d new mail conversation"
 msgstr[1] "You have %d new mail conversations"
 
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7671,34 +8000,44 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1657
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Removes contact from roster"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Error reading file:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1746
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7707,36 +8046,36 @@ msgstr ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 
-#: ../src/gajim.py:1841
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gajim.py:1912
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:1913
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1949
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gajim.py:1974
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/gajim.py:1975
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7744,11 +8083,11 @@ msgstr ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 
-#: ../src/gajim.py:2028
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../src/gajim.py:2029
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7759,19 +8098,19 @@ msgstr ""
 "(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: ../src/gajim.py:2050
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7784,11 +8123,11 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../src/gajim.py:2072 ../src/gajim.py:2102
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7796,16 +8135,11 @@ msgstr ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: ../src/gajim.py:2076 ../src/gajim.py:2106 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3789
-msgid "Do _not ask me again"
-msgstr "Do _not ask me again"
-
-#: ../src/gajim.py:2103
+#: ../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?"
@@ -7813,21 +8147,21 @@ msgstr ""
 "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?"
 
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/gajim.py:2121
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2589 ../src/gajim.py:2610
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gajim.py:2590
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7835,7 +8169,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../src/gajim.py:2611
+#: ../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 "
@@ -7845,55 +8179,38 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gajim.py:2637 ../src/roster_window.py:3323
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2917
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gajim.py:3014
-msgid "Bookmark already set"
-msgstr "Bookmark already set"
-
-#: ../src/gajim.py:3015
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Group Chat \"%s\" is already in your bookmarks."
-
-#: ../src/gajim.py:3028
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark has been added successfully"
-
-#: ../src/gajim.py:3029
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "You can manage your bookmarks via Actions menu in your roster."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7901,47 +8218,48 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "message"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -7949,19 +8267,23 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7971,29 +8293,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8003,134 +8325,134 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sends new message to a groupchat you've joined."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID of the room that will receive the message"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8138,67 +8460,72 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI to handle"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Account in which you want to handle it"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "message contents"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Room JID"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Nickname to use"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Password to enter the room"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Account from which you want to enter the room"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8207,15 +8534,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "It seems Gajim is not running. So you can't use gajim-remote."
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8224,16 +8551,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8242,7 +8569,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8251,7 +8578,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8260,7 +8587,7 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8277,173 +8604,177 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Please create a clean new theme with your desired name."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "theme name"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "You cannot delete your current theme"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr "Really send file?"
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "If you send a file to %s, he/she will know your real Jabber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "The server has assigned or modified your roomnick"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../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 has been removed from the room (%(reason)s)"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Affiliation of %(nick)s has been set to %(affiliation)s"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Role of %(nick)s has been set to %(role)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-msgid "Invalid nickname"
-msgstr "Invalid nickname"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname not found: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "This group chat has no subject"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Nickname not found: %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 ""
 "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."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8452,7 +8783,7 @@ msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8461,7 +8792,7 @@ msgstr ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8470,7 +8801,7 @@ msgstr ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8479,18 +8810,17 @@ msgstr ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "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."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8499,62 +8829,76 @@ msgstr ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Usage: /%s <nickname>, changes your nickname in current group chat."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8562,22 +8906,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2390
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2389
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8608,74 +8952,74 @@ msgstr "Details"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Error parsing file:"
 
 #. 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 "Could not write to %s. Session Management support will not work"
 
 #. 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 is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Would you like to make Gajim the default Jabber client?"
 
-#: ../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 "Always check to see if Gajim is the default Jabber client on startup"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../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 "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Message"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8683,7 +9027,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8697,26 +9041,26 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Do you really want to delete the logs of the selected contact?"
 msgstr[1] "Do you really want to delete the logs of the selected contacts?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:585
+#: ../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] "Do you really want to delete the selected message?"
@@ -8746,122 +9090,133 @@ msgstr "Status is now: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "You are not connected to the server"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Do you really want to delete the selected message?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr "- messages will be logged"
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %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 "Messaged by %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Generic"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignore"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2786
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2789
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2791 ../src/roster_window.py:2802
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -8869,54 +9224,46 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:944
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1859
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1880
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1919
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1949
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:2118 ../src/roster_window.py:3266
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../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?"
@@ -8924,15 +9271,28 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2145
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2283 ../src/roster_window.py:2520
+#: ../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 "Are you sure you want to leave group chat \"%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 "You have unread messages"
 
-#: ../src/roster_window.py:2284
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8940,16 +9300,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2524
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8957,11 +9317,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2528
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2533
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8971,51 +9331,56 @@ msgstr ""
 "these transports: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2667
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2675
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Also remove all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2773
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3131
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9024,11 +9389,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3136
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3140
+#: ../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."
@@ -9036,16 +9401,16 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3143
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3147
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3151
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9054,19 +9419,19 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3190
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: ../src/roster_window.py:3707
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3709
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9074,13 +9439,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:3783
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3785
+#: ../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 "
@@ -9090,139 +9455,141 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:3898
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:3909
+#: ../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] "Do you want to send this file to %s:"
 msgstr[1] "Do you want to send these files to %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Send %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Make %s and %s metacontacts"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4586 ../src/roster_window.py:4657
-#: ../src/roster_window.py:4666 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "using account %s"
 
 #. add
-#: ../src/roster_window.py:4673
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4678
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4715 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4735
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4775
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:4837 ../src/roster_window.py:4946
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:4864
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:4871
-msgid "Mood"
-msgstr "Mood"
-
-#: ../src/roster_window.py:4875
-msgid "Activity"
-msgstr "Activity"
-
-#: ../src/roster_window.py:4880
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
 #. Send Group Message
-#: ../src/roster_window.py:5042 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5050
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5054
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "To all online users"
 
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5587
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
 #. Send single message
-#: ../src/roster_window.py:5648
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5704
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5712
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5794
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
-#: ../src/roster_window.py:5874
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
 #. History manager
-#: ../src/roster_window.py:5987
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5996
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6206
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9239,20 +9606,20 @@ msgstr "Error in received dataform"
 msgid "No result"
 msgstr "No result"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9267,7 +9634,7 @@ msgstr ""
 "\n"
 "\tAre these options acceptable?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9282,124 +9649,116 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../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 "Resource: "
 
-#: ../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 of this group chat"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blocked]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: ../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 "Last status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Mood:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Activity:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Tune:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed 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"
@@ -9415,16 +9774,21 @@ msgstr "Unknown"
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Unknown"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9432,7 +9796,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9440,13 +9804,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9454,21 +9818,106 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#, fuzzy
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Toggle Open_PGP Encryption"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr "Click to see features (like MSN, ICQ transports) of jabber servers"
+
+#~ msgid "Servers Features"
+#~ msgstr "Servers Features"
+
+#~ msgid "Your JID:"
+#~ msgstr "Your JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Name:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Show _roster"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Select the account with which to synchronise"
+
+#~ msgid "Modify Account"
+#~ msgstr "Modify Account"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim account %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Always use OS/X default applications"
+
+#~ msgid "Custom"
+#~ msgstr "Custom"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Duplicate Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "This account is already configured in Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Idle"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Requires compilation of the idle module from Gajim sources."
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "File transfer stopped by the contact at the other end"
+
+#~ msgid "Generic"
+#~ msgstr "Generic"
+
+#~ msgid "Mood"
+#~ msgstr "Mood"
+
+#~ msgid "Activity"
+#~ msgstr "Activity"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
@@ -9524,9 +9973,6 @@ msgstr " resource with priority "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Retype Password:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Use proxy"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9720,12 +10166,6 @@ msgstr " resource with priority "
 #~ msgid "_Pop it up"
 #~ msgstr "_Pop it up"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
-#~ msgid "Address"
-#~ msgstr "Address"
-
 #~ msgid "City:"
 #~ msgstr "City:"
 
@@ -9845,9 +10285,6 @@ msgstr " resource with priority "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Drop %s in group %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Make %s and %s metacontacts"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Hides the buttons in two persons chat window."
 
diff --git a/po/eo.po b/po/eo.po
index b40a2ca42..0dd3e6c8f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,15 +1,15 @@
 # Esperanto translations for gajim package.
 # Copyright (C) 2006 THE gajim'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the gajim package.
-# Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>, 2006.
 #
 #
+# Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>, 20, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-29 00:11+0400\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:48+0200\n"
 "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -40,7 +40,7 @@ msgid "_Add Contact..."
 msgstr "_Aldoni kontakton..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Serĉi servojn"
 
@@ -63,7 +63,7 @@ msgid "_Personal Events"
 msgstr "Persona detalaĵoj"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Ekparoli"
@@ -98,67 +98,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Klaku por vidi trajtojn (kiel MSN, ICQ transportiloj) de jabber-serviloj"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Konekti kiam vi premos Finigi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontkreilo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Mi jam havas konton, mi volas uzi ĝin"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Mi volas registri novan konton"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Administri..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Prokura servilo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Konservi pasvorton"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Servilaj trajtoj"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Korekti vian personan informon kiam vi konektitos"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Uzi propran servilnomon/pordon"
 
@@ -171,31 +169,32 @@ msgstr ""
 "al la jaber-reto."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Via JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Krome"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Finigi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Servilnomo: "
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Pordo:"
 
@@ -203,11 +202,6 @@ msgstr "_Pordo:"
 msgid "_Server:"
 msgstr "_Servilo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Salutnomo:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -216,18 +210,16 @@ msgstr "<b>Cetero</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persona informo</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Konto"
 
@@ -236,24 +228,23 @@ msgid "Account Modification"
 msgstr "Konta korektado"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Estra listo"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_onekti dum lanĉo de Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Ŝanĝi _pasvorton"
 
@@ -269,37 +260,35 @@ msgstr ""
 "servilo subtenas ĝin, kaj tiu opcio malŝaltas TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Elekti _ŝlosilon..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klaku por ŝanĝi konta pasvorton"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Konekto"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Korekti personan informon..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -307,17 +296,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Ĝenerala"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Servilnomo: "
 
@@ -340,7 +326,6 @@ msgstr ""
 "preventas diskonekton pro longa neaktiva tempo"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -350,7 +335,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -358,7 +342,6 @@ msgstr "Se markitas, Gajim aŭtomate konektos per tiu konto dum lanĉo"
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -373,43 +356,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informo pri vi, kiel estas en la servilo"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Neniu"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persona informo"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Pordo: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_tato:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -420,7 +405,7 @@ msgstr ""
 "la plej granda prioritato ricevas eventojn"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
 
@@ -429,12 +414,12 @@ msgid "Proxy:"
 msgstr "Prokura servilo:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Risur_cnomo:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -448,30 +433,25 @@ msgstr ""
 "ricevos la eventojn."
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Konservi pas_frazon (malsekure)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Sendi vivkontrolajn pakaĵojn"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_ronigi kontan staton kun komuna stato"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -482,21 +462,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Uzi _SSL (malnovan)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Uzi dosiertransmetan prokuran servilon"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Alĝustigi laŭ stato"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Nomo:"
 
@@ -505,31 +480,38 @@ msgstr "_Nomo:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Alĝustigi laŭ stato"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoj"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Retpoŝtadreso:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ebligi"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Nomo:"
 
@@ -539,7 +521,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -550,56 +531,96 @@ msgstr ""
 "Vi povas pripensi ŝanĝon de permeseblaj parametroj de retŝirmilo."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Familia nomo:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Unuigi kontojn"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_nomigi"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Sendi vivkontrolajn pakaĵojn"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sink_ronigi kontan staton kun komuna stato"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Uzi propran servilnomon/pordon"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Uzi propran pordon:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Korekti personan informon..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Ebligi"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Servilnomo: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Administri..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Pordo:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "K_onto:"
@@ -789,7 +810,7 @@ msgid "All statuses"
 msgstr "ia ajn stato"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Fora"
 
@@ -806,7 +827,7 @@ msgid "Have "
 msgstr "Havas "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Nevidebla"
 
@@ -815,7 +836,7 @@ msgid "Launch a command"
 msgstr "Lanĉi komandon"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Nedisponebla"
 
@@ -940,7 +961,7 @@ msgstr "Familia nomo:"
 msgid "New entry received"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../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 ""
 
@@ -988,11 +1009,21 @@ msgstr "Enigu novan pasvorton:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Tajpu vian novan statmesaĝon</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Ŝaltita"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Babilejo:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Antaŭpreparitaj mesaĝoj:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Konservi kiel antaŭpreparitaj..."
 
@@ -1055,11 +1086,11 @@ msgstr "_Aldoni al kontaktlisto"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historio"
 
@@ -1171,7 +1202,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Kiam dosiertransmeto estos plenumita, montri ŝprucfenestron kun avizo"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Daŭrigi"
 
@@ -1207,7 +1238,7 @@ msgstr ""
 "Kontakta linio\n"
 "Rubando"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Dika"
 
@@ -1227,11 +1258,11 @@ msgstr "Etosa administrado de Gajim"
 msgid "Gone"
 msgstr "Foriris"
 
-#: ../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 "Neaktiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kursiva"
 
@@ -1282,7 +1313,7 @@ msgstr "Ŝanĝi _temon"
 msgid "Configure _Room..."
 msgstr "Administri _babilejon"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Starigi legosignon por tiu babilejo"
@@ -1317,23 +1348,37 @@ msgstr "_Estro"
 msgid "_Ban"
 msgstr "_Malpermesi"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Elpeli"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Mastro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Sendi privatan mesaĝon"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voĉo"
 
@@ -1342,13 +1387,13 @@ msgstr "_Voĉo"
 msgid "Create new post"
 msgstr "Nova mesaĝo"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Temo"
 
@@ -1373,7 +1418,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim administrilo de protokoloj"
 
-#: ../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 "Forigi"
 
@@ -1398,7 +1444,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Serĉi datumbaze"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Historio de interparoloj"
 
@@ -1419,7 +1465,7 @@ msgstr "Serĉi"
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
@@ -1446,8 +1492,8 @@ msgstr "Antaŭ nelonge:"
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Aliĝi"
 
@@ -1475,7 +1521,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Eligi statojn:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Servilo:"
 
@@ -1507,36 +1553,56 @@ msgid "<b>Settings</b>"
 msgstr "<b>Agordo</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP Connect\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Administri prokurservilajn agordojn"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Nomo:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pas_vorto:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Tipo:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Prokura servilo:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Uzi aŭtentokontrolon"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Pordo:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Retnodo:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Uzi prokuran servilon"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Salutnomo:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1576,17 +1642,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Klaku por enigi mienon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klaku por enigi mienon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Sendi"
 
@@ -1691,10 +1762,14 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Ebligi avizadon dum stato fora/nedisponebla/okupata/nevidebla"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Demandi statmesaĝon kiam mi:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1709,21 +1784,21 @@ msgstr ""
 "Ĉiam uzi defaŭlton de XFCE\n"
 "Propraj"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Agordo de koloro kaj tiparo de la fasado"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1732,34 +1807,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Montri _kromajn detalojn pri retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1769,7 +1844,7 @@ msgstr ""
 "povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
 "montri en interparolaj fenestroj."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1779,7 +1854,7 @@ msgstr ""
 "Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
 "interparolanto."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1787,36 +1862,36 @@ msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus elsalutis"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1824,7 +1899,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1832,7 +1907,7 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1840,7 +1915,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1848,7 +1923,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1856,14 +1931,14 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1874,21 +1949,21 @@ msgstr ""
 "singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
 "kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1898,13 +1973,13 @@ msgstr ""
 "kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
 "fora, okupata ktp...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1912,67 +1987,79 @@ msgstr ""
 "Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
 "ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Unu mesaĝfenestro:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Admi_nistri..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Konta korektado"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Avizi pri novaj _Gmail-leteroj"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persona detalaĵoj"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Ludi _sonojn"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Agordo"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Montri eventon en _taskopleto"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "E_nsalutas"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "E_lsalutas"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1980,148 +2067,152 @@ msgstr ""
 "Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
 "markitas, Gajim simple montros krudan mesaĝan tekston."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Defaŭlta stata p_iktogramaro:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Malrapidas"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "_Etoso:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Uzi _transportilajn piktogramarojn"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Uzi sisteman defaŭlton"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtomate _fora post:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Rigardilo:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Mienoj:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Dosieradministrilo:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Emfazi misskribajn vortojn"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignori formatadon en venantaj mesaĝoj"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "Ret_poŝtkliento:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtomate nedisponebla post:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "E_lira mesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Reŝargi kolorojn per defaŭlto"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Eniri en babilejon"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutoj"
 
@@ -2169,7 +2260,7 @@ msgstr "Jabber-ID"
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Privata listo"
 
@@ -2239,127 +2330,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Propraj</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sonoj</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Fako:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Retpoŝtadreso:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Kroma adreso:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familia nomo:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Propraj</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Hejmpaĝo:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Aldoni regulon</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Propraj</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Kaŝnomo:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefono:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Kondiĉoj</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Poŝtkodo:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Agordo</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sonoj</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Agordo</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Agordo</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sonoj</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Pri si"
 
@@ -2369,17 +2460,17 @@ msgstr "Klaku por starigi vian kaŝbildon"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: JJJJ-MM-TT"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Persona informo"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Laboro"
 
@@ -2397,8 +2488,8 @@ msgstr "Forigi konton el Gajim kaj el _servilo"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Forigi"
 
@@ -2423,14 +2514,14 @@ msgstr "Aranĝi _Grupojn"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Plenumi komandon..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_viti al"
 
@@ -2441,7 +2532,7 @@ msgstr "_Forigi"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sendi propran XML"
@@ -2468,12 +2559,6 @@ msgstr "Ekparoli"
 msgid "_Allow him/her to see my status"
 msgstr "_Permesi al li/ŝi vidi vian staton"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Malpermesi al li/ŝi vidi vian staton"
@@ -2497,17 +2582,35 @@ msgstr "_Renomigi"
 msgid "_Subscription"
 msgstr "_Abono"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "naŭ"
 
+#: ../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 "Forigi"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2535,59 +2638,64 @@ msgid "Profile, A_vatar"
 msgstr "_Vizitkarto"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Montri Trans_portilojn"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Kontoj"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Agoj"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Enhavo"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "A_dministri"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_Respondaro"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Agordo"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Eliri"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Sendi unuopan _mesaĝon..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Vido"
 
@@ -2605,12 +2713,12 @@ msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Serĉi"
 
@@ -2697,10 +2805,6 @@ msgstr "Mendo de abono"
 msgid "_Deny"
 msgstr "_Rifuzi"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2726,10 +2830,6 @@ msgstr "Sendi unuopan _mesaĝon"
 msgid "Show All Pending _Events"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Montri _kontaktliston"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_to"
@@ -2749,55 +2849,60 @@ msgstr "<b>Agoj</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risurco:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Agordo</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Priskribo</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Komentoj"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Administri _babilejon"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Kontakta informo"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Plu"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Kaŝbildeto:"
@@ -2810,6 +2915,11 @@ msgstr "<b>Jabber-trafiko</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML enigo</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Ebligi"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2838,13 +2948,13 @@ msgstr "Enigi Open_PGP-ŝlosilon"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Renomigi"
 
@@ -2868,30 +2978,26 @@ msgstr "Risurco:"
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Korekti konton"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontakta informo"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2916,7 +3022,7 @@ msgstr "Entjera"
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Koloro"
 
@@ -2941,224 +3047,261 @@ msgstr "(Mankas)"
 msgid "Hidden"
 msgstr "Kaŝita"
 
+#: ../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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Angla"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Belorusa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgara"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretona"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Ĉeĥa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Germana"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Greka"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Brita"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Hispana"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Eŭska"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Franca"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Kroata"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Itala"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norvega (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Nederlanda"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norvega"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Pola"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugala"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazila Portugala"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Rusa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Germana"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovaka"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Sveda"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Via mesaĝo ne povas esti sendita dum vi senkonektas."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "Substreko"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Kaŝnomo"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Tiparo:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Kontakta informo"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ĉifrado ebligata"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" de %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
@@ -3166,33 +3309,33 @@ msgstr "Uzi aŭtentokontrolon"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Komandoj: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uzado: /%s, - malplenigas la tekstan fenestron."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3200,66 +3343,66 @@ msgid ""
 msgstr ""
 "Uzado: /%s <ago>, sendas agon en aktualan babilejon (ekzemple /%s eksplodas)."
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uzado: /%s, - kaŝas la babiladajn butonojn."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "helpinformo mankas por /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3267,191 +3410,203 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 estas dosiero sed devas esti dosierujo"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 fermos tuj"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s estas dosierujo sed devas esti dosiero"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontakta informo"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "Babilema"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "naŭ"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ne malhelpu."
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "Priskribo"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Nova babilejo"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d nelegita mesaĝo"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Uzi D-Bus kaj avizadan demonon por montri avizojn"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al fora."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Aŭtomate fora"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutoj, post kiu via stato ŝanĝos al nedisponebla."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Nedisponebla pro longa senfarado"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Ebligi lig-lokan/zerokonf komunikadon"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Lingvo uzata de literumilo"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3461,7 +3616,7 @@ msgstr ""
 "'sometimes' - eligi tempon ĉiun print_ichat_every_foo_minutes minuton.\n"
 "'never' - neniam eligi tempon."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3472,18 +3627,18 @@ msgstr ""
 "preciza, 4 por la malplej preciza. Ĉi tio uzatas nur kiam print_time estas "
 "'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Trakti parojn * / _ kiel stiligajn signojn."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se \"True\", ne forigos */_ . Do *abc* estos dika sed restos kun neforigitaj "
 "* *."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3493,7 +3648,7 @@ msgstr ""
 "elektitas. Pri sintakso vidu http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (Se vi volas uzi tion, instalu docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3501,7 +3656,7 @@ msgstr ""
 "Signo kiu aligatos post kaŝnomo dum uzado de plenumigoklavo (Tab) en "
 "babilejo."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3509,7 +3664,7 @@ msgstr ""
 "Signo por aligi post dezirata kaŝnomo kiam iu alia en babilejo jam okupis "
 "tiun kaŝnomon."
 
-#: ../src/common/config.py:161
+#: ../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 "
@@ -3520,19 +3675,19 @@ msgstr ""
 "vidu pitonan dokumentaron pri la funkcio \"strftime\": http://docs.python."
 "org/lib/module-time.html"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Signoj kiuj eligotas antaŭ kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Signoj kiuj eligotas post kaŝnomo en konversacioj"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Ĉu aligi * kaj [n] al kontaktlisto titolo?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3540,11 +3695,11 @@ msgstr ""
 "Kiom da lineoj memori de antaŭa komunikado kiam interparola slipo/fenestro "
 "malfermas denove."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Kiom da minutoj devas resti lastaj lineoj de antaŭa komunikado."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3552,11 +3707,11 @@ msgstr ""
 "Sendi mesaĝon per Ctrl+Enter kaj Enter faras novan lineon (defaŭlta "
 "kondutmaniero de Mirabilis ICQ Kliento)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Kiom lineojn memori por Ctrl+Supren."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3565,11 +3720,11 @@ msgstr ""
 "Enigi propran URL kun %s en ĝi, kie %s estos la vorto/frazo, aŭ \"WIKTIONARY"
 "\" kio signifas uzi wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se markitas, oni eblas komandi al Gajim malproksime per gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3581,14 +3736,14 @@ msgstr ""
 "listen_to_network_manager=False kaj sync_with_global_status=True) surbaze de "
 "la stato de la retkonekto."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sendataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3596,7 +3751,7 @@ msgstr ""
 "Montrataj babilstataj avizoj en interparolaj fenestroj. Povas esti unu el "
 "\"all\", \"composing_only\", aŭ \"disabled\"."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3604,11 +3759,11 @@ msgstr ""
 "Kiam ne eligas tempon por ĉiu mesaĝo (print_time==sometimes), eligi ĝin "
 "ĉiujn x minutojn."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Demandi antaŭ fermi babilejan fenestron/slipon."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3616,7 +3771,7 @@ msgstr ""
 "Ĉiam demandi antaŭ fermi slipon/fenestron de babilejo el tiu cpacetdisigita "
 "listo de babilejaj JID."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3624,7 +3779,13 @@ msgstr ""
 "Neniam demandi antaŭ fermi babilejan slipon/fenestron el tiu ĉi listo de "
 "babilejaj JID separataj per spacetoj."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3633,33 +3794,27 @@ msgstr ""
 "Redifinas la retadreson, kiun ni sendas por dosiertransmeto okaze de "
 "adrestradukado."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC normo diras: KiB = 1024 bajtoj, KB = 1000 bajtoj."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Avizi eventojn en la sistema taskopleta bildeto."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Ĉu montri langeton kiam estas nur unu konversacio?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Ĉu montri langetan framon en interparolajn fenestrojn?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Ĉu montri fermontan butonon en sliplangeto?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3667,17 +3822,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Listo de punktokome separataj vortoj, kiuj estos emfazataj en babilejo."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3685,14 +3840,14 @@ msgstr ""
 "Se \"True\", finas Gajim kiam oni alklakas fenestran sisteman butonon X. "
 "Tiun ĉi parametron mi konsideras nur se pleta piktogramo uzatas."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "se \"True\", Gajim kontrolos ĉu ĝi estas defaŭlta jabber-kliento dum ĉiu "
 "lanĉo."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3700,7 +3855,7 @@ msgstr ""
 "Se \"True\", Gajim montros piktogramon sur ĉiuj langeton, kies slipo enhavas "
 "nelegitajn mesaĝojn. Depende de etoso tiu piktogramo povas esti animaciata."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3708,11 +3863,11 @@ msgstr ""
 "Se estas \"True\", Gajim montros statmesaĝojn, se ĝi ne estas malplena, por "
 "ĉiu kontakto sub la kontaktnomo en la kontaktlisto."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3720,7 +3875,7 @@ msgstr ""
 "Se \"True\", Gajim demandos pri kaŝbildeto ĉiun kontakton, kiu ne havis ĝin "
 "lastatempe aŭ kies kaŝbildeto estis konservita tro antaŭlonge."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3728,7 +3883,7 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3741,29 +3896,29 @@ msgstr ""
 "statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
 "Gajim eligos nur pri eniroj/eliroj."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se \"True\", rememoritaj mesaĝoj uzos pli malgrandan tiparon ol defaŭltaj."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3773,7 +3928,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3784,7 +3939,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3804,32 +3959,32 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se \"False\", vi ne plu vidos la kaŝbildetojn en la babileja fenestro."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se \"True\", premo de la klavo \"Escape\" fermas slipon/fenestron."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Kaŝas la liston de partoprenantoj en la babileja fenestro."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3837,27 +3992,27 @@ msgstr ""
 "En konversacio, montri la kaŝnomon komence de linio nur kiam tiu ne estas la "
 "sama persono dirinta ĉi-antaŭan mesaĝon."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Listo de koloroj kiuj estos uzata por kolorigi kaŝnomojn en babilejoj."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab iras al sekva konversacian langeton se ĉiuj legitas."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3865,7 +4020,7 @@ msgstr ""
 "Ĉu ni montru la certigan dialogujon pri kreado de metakontaktoj aŭ ne? "
 "Malplena linio signifas ke ni neniam monru la dialogujon."
 
-#: ../src/common/config.py:256
+#: ../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 "
@@ -3875,7 +4030,7 @@ msgstr ""
 "nombroj en la konta korekdada fenestro. GARDU VIN, se vi ensalutis kun "
 "negativa prioritato, vi ricevos neniujn mesaĝojn de via servilo."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3883,7 +4038,16 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
+"pasvortojn."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3891,7 +4055,7 @@ msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: ../src/common/config.py:259
+#: ../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"
@@ -3899,51 +4063,57 @@ msgstr ""
 "Povas esti malplena, 'chat' aŭ 'normal'. Se ne malplena, rigardi ĉiujn "
 "venantajn mesaĝojn kiel ili estas de ĉi tiu tipo"
 
-#: ../src/common/config.py:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../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 separately)"
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"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:278
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3951,60 +4121,68 @@ msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4012,119 +4190,125 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "'all' aŭ spacetseparitaj statoj"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aŭ 'both'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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' aŭ ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4132,148 +4316,178 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Malprava servilnomo"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Vizitkarto estas sukcese publicita"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Malkorekta jabber-ID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Neeblas aliĝi al babilejo"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vi ne ĉeestas en membrolisto."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Permeso estas forigita"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nun ni abonas %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ni nun ne abonas pri %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4283,248 +4497,253 @@ msgstr ""
 "kontaktlistan agordan ilon kiel http://jru.jabberstudio.org/ por forigi ĝin"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP-pasfrazo ne estis donita"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Vi estos konektita al %s sen OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s ne estas valida protokola detalnivelo"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transportilo %s respondis malprave al registra peto: %s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Konektado malsukcesis"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Konservita kiel: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Kontrolu vian konekton aŭ provu denove poste"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4533,26 +4752,31 @@ msgstr ""
 "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj "
 "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Neeblas sendi senenhavajn dosierojn"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4561,19 +4785,30 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Kontaktoj"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Rigardiloj"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transportiloj"
 
@@ -4582,11 +4817,11 @@ msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Pitona bindmodulo por D-BUS mankas cxe tiu cxi komputilo"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-BUS kunigeblo de Gajim ne uzeblas"
 
@@ -4616,1112 +4851,1122 @@ msgstr ""
 "Seancbuso nedisponeblas.\n"
 "Provu legi http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dekdu"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "unu"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "du"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "kvar"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "kvin"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "ses"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sep"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "ok"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "naŭ"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dek"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "dekunu"
 
+#. 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 "dekdu"
-
-#. 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 "la $0a horo"
+msgid "%(0)s o'clock"
+msgstr "la %(0)sa horo"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "kvin minutoj post la $0a"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "kvin minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "dek minutoj post la $0a"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "dek minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvarono post la $0a"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "kvarono post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dudek minutoj post la $0a"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "dudek minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dudek kvin minutoj post la $0a"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "dudek kvin minutoj post la %(0)sa"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "la $0a kaj duono"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "la %(0)sa kaj duono"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dudek kvin minutoj antaŭ la $1a"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "dudek kvin minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dudek minutoj antaŭ la $1a"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "dudek minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvarono antaŭ la $1a"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "kvarono antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "dek minutoj antaŭ la $1a"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "dek minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "kvin minutoj antaŭ la $1a"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "kvin minutoj antaŭ la %(1)sa"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "la $1a horo"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "la %(1)sa horo"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Nokto"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Frua mateno"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Mateno"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Preskaŭ tagmezo"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Tagmezo"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Posttagmezo"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Vespero"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Malfrua vespero"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Komenco de semajno"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Mezo de semajno"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Fino de semajno"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Enrete"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Enrete"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "tajpas mesaĝon..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Sendi mesaĝon"
 msgstr[1] "Sendi mesaĝon"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s ne estas valida protokola detalnivelo"
+
 #. 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 "eraro: %s nedisponeblas por legi"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim-konto %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "de konto %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Paŭzas"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Dika"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Havas "
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Babilejoj"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Dika"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Enhavo"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Plenumita"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Enhavo"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Malŝaltita"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Forigi"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "malŝaltitaj"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "malŝaltitaj"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "malŝaltitaj"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Excited"
 msgstr "Ŝaltita"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Retnodo:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "mesaĝo"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Ŝaltita"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Nevidebla"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "unu"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Retnodo:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Germana"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Korekti"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Senkonekta"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "dekunu"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Malrapidas"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr ""
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Kaŝnomo"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Dormas"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Strato:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Abonita"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "Substreko"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Malprava servilnomo"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Vespero"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Tajpas mesaĝon"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Mateno"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "ĉiuj en la grupo"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Vespero"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Elpelatas %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Aliĝi"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "babilejo"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Korektas temon"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Elpelatas %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Elpelatas %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "E_lsalutas"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Kialo"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Kialo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Dormas"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Mi spektas filmon."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Manĝas"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Mi telefonas."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Transdonas"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Tajpas mesaĝon"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Tajpas mesaĝon"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Laboras"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Neeblas aliĝi al pordo %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5730,18 +5975,13 @@ msgstr ""
 "estos nuligita."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5750,15 +5990,15 @@ msgstr ""
 "La servilnomo, specifita de vi en la agordero \"ft_override_host_to_send\" "
 "de la detala agordo, ne ekzistas aŭ malkorektas, tial estas ignorata."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Por plu sendi kaj ricevi mesaĝojn, vi bezonas rekonekti."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Eraro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5767,32 +6007,32 @@ msgstr ""
 "%s\n"
 "Lig-loka komunikado ne povas funkcii korekte."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Bonvolu certiĝi ke Avahi estas instalita."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Ne povas lanĉi lokan servon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Neeblas aliĝi al pordo %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ne povas ŝanĝi staton de konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5800,63 +6040,51 @@ msgstr ""
 "Vi estas senkonekta aŭ nevidebla por aliaj. Via mesaĝo ne estis sendita."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakto estas senkonekta. Via mesaĝo ne estas sendita."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Konekto kun retnodo malsukcesis: Templimo atingitis dum datumsendado."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "eraro dum aldonado de servo %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "malŝaltitaj"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Aktiva"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Evento"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Defaŭlta statmesaĝo"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Propraj</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5865,250 +6093,208 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Unua mesaĝo ricevita"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Sekva mesaĝo ricevita"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Sekva mesaĝo ricevita"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kontakto konektita"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kontakto malkonektita"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Mesaĝo sendita"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Emfazado de mesaĝoj en babilejo"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Ricevitas mesaĝo en babilejo"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "GMail-retletero venis"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Nomo"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se vi volas ekuzi la ĉiujn ŝanĝojn, vi devas rekonekti."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Ĉiuj konversaciajn fenestrojn fermitos. Ĉu daŭrigu?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "Por ŝanĝi la nomon de konto, vi devas legi atendantajn eventojn."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Malkorekta jabber-ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Bonvolu renomigi aŭ forigi ĝin antaŭ ebligi lig-lokan komunikadon."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6116,11 +6302,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6128,11 +6314,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6140,11 +6326,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6152,14 +6338,15 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Devas esti en unu el sekvaj formoj:\n"
 "1. uzulo@domajno/risurco (nur tiu risurco).\n"
@@ -6168,85 +6355,92 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Bonvolu konvinkiĝi, ke kampoj Servilo kaj Babilejo estas plenitaj aŭ forigi "
 "tiun ĉi legosignon."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Ripeta Jabber-ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6255,27 +6449,34 @@ msgstr ""
 "Vi povas agordi kromajn kontajn parametrojn alklakinte la butonon \"Krome\" "
 "aŭ pli poste menueron Kontoj en menuo Administri de la ĉefa fenestro."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Via nova konto estas sukcese kreita"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6285,7 +6486,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6293,30 +6494,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Via nova konto estas sukcese kreita"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktiva"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Evento"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Unua mesaĝo ricevita"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Sekva mesaĝo ricevita"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Sekva mesaĝo ricevita"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontakto konektita"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontakto malkonektita"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Mesaĝo sendita"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Emfazado de mesaĝoj en babilejo"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Ricevitas mesaĝo en babilejo"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "GMail-retletero venis"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6325,75 +6568,75 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Eliri"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Vortara URL ne enhavas \"%s\" kaj ĝi ne estas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Antaŭ %i tagoj"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber-tujmesaĝilo"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6408,147 +6651,147 @@ msgstr "Kontaktnomo: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber-ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "En la grupo"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Ŝlosil-ID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Kontaktnomo"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Enigi tagmesaĝon"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Mesaĝo por la stato \"%s\""
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statmesaĝo"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Tiu nomo jam estas uzata de alia el viaj kontoj. Bonvolu elekti alian nomon."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Konservi kiel antaŭpreparita statmesaĝo"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Bonvolu tajpi nomon de tiu statmesaĝo"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM-adreso:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG numero:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ numero:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN-adreso:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo-adreso:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni ĉe konto %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bonvolu pleni la datumon pri kontakto, kiun vi volas aldoni"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Fine ne malpli ol aliajn ni dankas ĉiujn pakaĵvartistojn."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6559,93 +6802,93 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Demando pri abono por konto %s de %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas senkonekta."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
@@ -6654,276 +6897,301 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Mi estas %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML-konzolo"
 
-#: ../src/dialogs.py:2568
+#. 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 "Mi petas vin permesi aldoni vin en mian kontaktliston."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Aldoni"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Korekti"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber-ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupo"
+
+#. 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 "Mi volus aldoni vin al mia kontaktlisto."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordnumero: %s, ago: %s, tipo: %s, valoro: %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "n°"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6931,38 +7199,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6972,58 +7240,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Aliaj"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7031,317 +7299,341 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Tiu tipo de servo ne enhavas erojn por rigardi."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Plenumi komandon..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "Legosigno jam estas metita"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Legosigno sukcese aldonitas"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Komandoj: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Historia administrilo"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Mesaĝo sendita"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Pasvortoj diversas"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Konta korektado"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "_Alĝustigi laŭ stato"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Ĉifrado per OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "Ve_nanta mesaĝo:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Ĝenerala"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Servilaj trajtoj"
@@ -7371,7 +7663,7 @@ msgstr "Longo: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Vi"
 
@@ -7381,7 +7673,7 @@ msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
@@ -7413,27 +7705,28 @@ msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Dosiertransmeto estas hatlita de aliflanka kontakto"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Dosiera transmeto haltitas"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Elektu dosieron por sendi..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne povas atingi tiun dosieron"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Tiu ĉi dosiero estas uzata de alia procezo."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Dosiero: %s"
@@ -7453,34 +7746,34 @@ msgstr "Priskribo: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr ""
 "Dosiero kun tiu nomo jam ekzistas kaj vi ne havas permeson reskribi ĝin."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Kion vi volas fari?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
@@ -7516,48 +7809,52 @@ msgstr "Dosiero: "
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s ne estas valida protokola detalnivelo"
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim bezonas X-servilon. Finas..."
 
-#: ../src/gajim.py:186
-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 bezonas PyGTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:187
-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 bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:189
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:190
-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 bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Mankas subteno de libglade en GTK+"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7566,22 +7863,22 @@ msgstr ""
 "Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
 "stabilan version de %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Bonvolu kontroli ke GTK+ kaj PyGTK en via sistemo subtenas la bibliotekon "
 "libglade."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim bezonas PySqlITE2 por funkcii"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim bezonas pywin32 por funkcii"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7591,11 +7888,11 @@ msgstr ""
 "povas preni ĝin ĉe %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7603,25 +7900,34 @@ msgstr ""
 "Alia ekzemplero de Gajim ŝajne estas lanĉita\n"
 "Ĉu lanĉu malgraŭ tio?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Vi estos konektita al %s sen OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7631,147 +7937,186 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: ../src/gajim.py:571
+#: ../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 "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Mendo de abono"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "La kontakto \"%s\" permesas al vi vidi lian aŭ ŝian staton."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Malaboni"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s nomiĝas %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 nun estas %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Necesas pasvorto por aliĝi al la babilejo."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "_Ne plu demandi"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
+"(medivariablo eble ne korekte valorizitas)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Vi havas %d novan retleteron"
 msgstr[1] "Vi havas %d novajn retleterojn"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7781,82 +8126,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Forigas kontakton el kontaktlisto"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Eraro dum legado de dosiero:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "La dosiero %(filename)s de %(name)s estas sukcese ricevita."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s de %(name)s haltitas."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vi sukcese sendis %(filename)s al %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transmeto de dosiero %(filename)s al %(name)s haltitas."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7864,130 +8219,107 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konekto"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "_Ne plu demandi"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Vi ne povas aliĝi al babilejo dum vi estas nevidebla"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Legosigno jam estas metita"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Legosigno sukcese aldonitas"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Vi povas aranĝi viajn legosignojn per menuero \"Agoj\" en la kontaktlisto."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Montri helpon pri specifita komando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "komando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "montri helpon pri komando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Antaŭigas fenestron kun la sekva atendanta evento"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7995,48 +8327,49 @@ msgstr ""
 "Eligas liston de ĉiuj kontaktoj de kontaktlisto. Ĉiu kontakto aperas en "
 "separata lineo"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "Montri kontaktojn nur de specifita konto"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Eligas liston de registritaj kontoj"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ŝanĝas staton de konto aŭ kontoj"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "mesaĝo"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statmesaĝo"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8045,19 +8378,23 @@ msgstr ""
 "statojn de ĉiuj kontoj, kiuj havas ŝaltitan parametron \"sinkronigi kun "
 "komuna stato\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Montras interparolan fenestron do vi povas sendi mesaĝon al kontakto"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Se specifita, kontakto estos prenata el kontaktlisto de tiu ĉi konto"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8067,29 +8404,29 @@ msgstr ""
 "kaj konto estas fakultativaj. Se vi volas specifi nur konton sen OpenPGP-"
 "ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "PGP-ŝlosilo"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Se specifita, la mesaĝo estos ĉifrita per tiu ĉi publika ŝlosilo"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Se specifita, la mesaĝo estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8099,134 +8436,134 @@ msgstr ""
 "ŝlosilo kaj konto estas fakultativaj. Se vi volas specifi nur konton sen "
 "OpenPGP-ŝlosilo, do specifu \"OpenPGP-ŝlosilo\" kiel \"\"."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "temo"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "temo de mesaĝo"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID de kontakto, kiu ricevos la mesaĝon"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Ricevas detalan informon pri kontakto"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID de la kontakto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Ricevas detalan informon pri konto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Nomo de la konto"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sendi dosieron al kontakto"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "dosiero"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Dosierindiko"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Se specifita, dosiero estos sendita per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Listo de ĉiuj parametroj kaj ilia valoroj"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Valorigi \"ŝlosilo\" per \"valoro\"."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ŝlosilo=valoro"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"ŝlosilo\" estas nomo de parametro, \"valoro\" estas ĝia stato"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Forigas parametron"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ŝlosilo"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nomo de forigota parametro"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skribas la aktualan agordon de Gajim en la dosieron \".config\""
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Aligas kontakton en kontaktliston"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Aldonas novan kontakton en tiun konton"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Donas nuntempan staton (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Donas nuntempan statmesaĝon (la komuna se konto estas nespecifita)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Donas kvanton de nelegitaj mesaĝoj"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Malfermi \"Ekparoli\" dialogfenestron"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Babili per tiu ĉi konto"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Sendi propran XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML por sendi"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8234,72 +8571,77 @@ msgstr ""
 "Konto kien la XML sendotas; se konto nespecifitas, XML sendotas al ĉiuj "
 "kontoj"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Prilabori xmpp:/ uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "mesaĝenhavo"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Babilejo:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasvortoj diversas"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8308,31 +8650,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8341,7 +8683,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8350,7 +8692,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8359,7 +8701,7 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Malprava uri"
 
@@ -8377,176 +8719,179 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "Etosa nomo"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Vi ne povas forigi aktivan etoson"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vi ne plu ĉeestas en babilejo \"%s\" aŭ \"%s\" foriris."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Aliĝo de %(nick)s nun estas malpermesa: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Aliĝo de %(nick)s estas malpermesita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s estas elpelita de %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Malkorekta salutnomo"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Tiu ĉi babilejo ne havas temon"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invititas al %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Kaŝnomo ne trovitas: %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 ""
 "Uzado: /%s <kaŝnomo|JID> [kialo], malpermesas, ke la JID aliĝi al la "
 "babilejo. Eblas uzi la kaŝnomon de uzulo, sed ne se ĝi entenas \"@\" aŭ "
 "spaceton. Se la JID ĉeestas en la babilejo, tiu estos ankaŭ elpelita."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8555,7 +8900,7 @@ msgstr ""
 "Uzado: /%s <kaŝnomo>, - malfermas privatan interparolan fenestron por "
 "specifita persono."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8564,7 +8909,7 @@ msgstr ""
 "Uzado: /%s [kialo], - fermas la nuntempan fenestron aŭ slipon, informe pri "
 "kialo se specifita."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8573,7 +8918,7 @@ msgstr ""
 "Uzado: /%s <JID> [kialo], - invitas JID al la nuntempa babilejo, fakultative "
 "informante pri kialo."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8582,17 +8927,16 @@ msgstr ""
 "Uzado: /%s <babilejo>@<servilo>[/kaŝnomo], - aliĝas al room@server "
 "fakultative uze specifitan kaŝnomon."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Uzado: /%s <kaŝnomo> [kialo], - forigas la uzulon specifitan per kaŝnomo el "
 "la babilejo kaj fakultative montras kialon. NE SUBTENAS spacetojn en kaŝnomo."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8601,82 +8945,96 @@ msgstr ""
 "Uzado: /%s <kaŝnomo> [mesaĝo], malfermas privatan mesaĝan fenestron kaj "
 "sendas mesaĝon al la uzulo specifita per kaŝnomo."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uzado: /%s , - eligas la nomoj de babilejaj ĉeestantoj."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uzado: /%s [temo], - eligas aŭ novigas la nuntempan babilejan temon."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uzado: /%s <mesaĝo>, - sendas mesaĝon preter rekonado de aliaj komandoj."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Uzado: /%s <kaŝnomo>, ŝanĝas vian kaŝnomon en nuntempa babilejo."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se vi fermos tiun fenestron, vi senkonektiĝos de tiu ĉi babilejo."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -8705,82 +9063,82 @@ msgstr "Detalaĵoj"
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Eraro dum dosieranalizo:"
 
 #. 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 "Ne povas skribi en %s. Subteno de seancagordo ne funkcios"
 
 #. 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 ne estas defaŭlta jabber-kliento"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ĉu vi deziras fari Gajim la defaŭlta jabber-kliento?"
 
-#: ../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 "Ĉiam kontrolu ĉu Gajim estas defaŭlta jabber-kliento dum lanĉo"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../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 ""
 "Bildo nekonserveblas en %(type)s formato. Ĉu konservu kiel %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontaktoj"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ĉu vi volas malplenigi la datumbazon? (EGE MALREKOMENDITA SE GAJIM AKTIVAS)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8794,229 +9152,230 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Eksportas protokolojn..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s je %(time)s diris: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Ĉu vi vere volas forigi protokolojn de la elektita kontakto?"
 msgstr[1] "Ĉu vi vere volas forigi protokolojn de la elektitaj kontaktoj?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: ../src/history_manager.py:585
+#: ../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] "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
 msgstr[1] "Ĉu vi efektive volas forigi la elektitajn mesaĝojn?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historio de interparolo kun %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s nun estas %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Vi nekonektitas al la servilo"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Ĉu vi efektive volas forigi la elektitan mesaĝon?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Mesaĝoj"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova unuopa mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privata mesaĝo de babilejo %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Ĝenerala"
+msgid "Ignore"
+msgstr "naŭ"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Informo estas ricevita"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senkonekte vi ne povas publikigi vian kontaktan informon."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Publicas vizitkarton..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Informo NE publicitis"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Publicado de vizitkarto malsukcesis"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" akceptas tiun peton vi povos koni lian aŭ ŝian staton."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:1920
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnoma ŝlosilaro (Gnome Keyring) instalitas sed ne estas korekte lanĉita "
-"(medivariablo eble ne korekte valorizitas)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9024,31 +9383,44 @@ msgstr ""
 "Ŝanĝo de via stato per nevidebla okazigos diskonektadon de tiuj babilejoj. "
 "Ĉu vi certas ke vi volas iĝi nevidebla?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Ĉu vi certe volas foriri el babilejo \"%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 "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mesaĝoj disponeblos por legi ĝin poste nur se vi ŝaltis historion."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9056,11 +9428,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9070,52 +9442,57 @@ msgstr ""
 "transportiloj:%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ĉu vi volas forigi la grupon %s de la kontaktlisto?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Forigi ankaŭ ĉiujn kontaktojn de la grupo el via kontaktlisto"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9124,12 +9501,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9137,16 +9514,16 @@ msgstr ""
 "Forigante tiu ĉi konton vi defaŭlte ankaŭ forigas permeson pro kio li aŭ ŝi "
 "ĉiam vidos vin senkonekta."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Permesi al tiu ĉi konto koni mian staton post forigado"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9155,19 +9532,19 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Vi devas krei konton antaŭ vi povos paroli kun aliaj kontaktoj."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9176,12 +9553,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Pri kreado de metakontakto. Ĉu vi certas ke vi volas daŭrigi?"
 
-#: ../src/roster_window.py:3786
+#: ../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 "
@@ -9191,149 +9568,150 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s volas sendi al vi dosieron:"
 msgstr[1] "%s volas sendi al vi dosieron:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Sendi %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Igi %s kaj %s metakontaktoj"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "per konto %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Aktiva"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Nova babilejo"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
@@ -9350,20 +9728,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Temo: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9373,7 +9751,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9383,129 +9761,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: ../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 "Risurco: "
 
-#: ../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 de tiu ĉi babilejo"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abono: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Babilejo:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Ŝaltita"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../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"
@@ -9521,17 +9889,22 @@ msgstr "Nekonata"
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Nekonata"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9539,38 +9912,96 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 "Vi interesiĝas pri kontakta ĉeesta informo, sed li/ŝi ne interesiĝas pri via"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vi kaj la kontakto interesiĝas unu pri alia ĉeesta informo"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Nek vi nek kontakto ne interesiĝas unu pri ĉeesto de alia"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Ĉifrado per OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Klaku por vidi trajtojn (kiel MSN, ICQ transportiloj) de jabber-serviloj"
+
+#~ msgid "Servers Features"
+#~ msgstr "Servilaj trajtoj"
+
+#~ msgid "Your JID:"
+#~ msgstr "Via JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Nomo:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Retnodo:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Montri _kontaktliston"
+
+#~ msgid "Modify Account"
+#~ msgstr "Korekti konton"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" de %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim-konto %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Propraj</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Ripeta Jabber-ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Tiu ĉi konto jam ĉeestas en kontlisto de Gajim."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Dosiertransmeto estas hatlita de aliflanka kontakto"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Ĝenerala"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Aktiva"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "Nek %s publicis OpenPGP-ŝlosilon, nek vi enigis ĝin"
@@ -9595,9 +10026,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Ripetu pasvorton:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Uzi prokuran servilon"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9771,9 +10199,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Kroma agordo de avizado..."
 
-#~ msgid "_Font:"
-#~ msgstr "_Tiparo:"
-
 #~ msgid "_Never"
 #~ msgstr "_Neniam"
 
@@ -9786,9 +10211,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Pop it up"
 #~ msgstr "_Antaŭigi la fenestron"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "Address"
 #~ msgstr "Adreso"
 
@@ -9917,9 +10339,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Movi %s en la grupon %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Igi %s kaj %s metakontaktoj"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Kaŝas la butonojn en dupersona interparola fenestro."
 
@@ -9965,9 +10384,6 @@ msgstr " risurco kun prioritato "
 #~ msgstr[0] " %d nelegita privata mesaĝo"
 #~ msgstr[1] "%d nelegitaj privataj mesaĝoj"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Konekto kun retnodo masukcesis: Nekorekta respondo de servilo."
@@ -10023,9 +10439,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Account:"
 #~ msgstr "_Konto:"
 
-#~ msgid "Add"
-#~ msgstr "Aldoni"
-
 #~ msgid "Away "
 #~ msgstr "Fora "
 
@@ -10053,9 +10466,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "Vizitkarto estas sukcese publicita"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Via persona informo estas sukcese publicita."
 
diff --git a/po/es.po b/po/es.po
index 06dbf1368..bbc73be8b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-17 10:29+0100\n"
-"PO-Revision-Date: 2005-05-21 20:03+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
-"Language-Team: none\n"
+"Language-Team: none <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
@@ -60,7 +60,7 @@ msgid "_Personal Events"
 msgstr "Eventos _personales"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "Iniciar conver_sación"
 
@@ -92,6 +92,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Por favor, selecciona un servidor</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"
@@ -99,96 +103,96 @@ msgstr ""
 "Añadir este certificado a la lista de certificados de confianza.\n"
 "Huella SHA1 del certificado:\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 "Usar autentificación"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Conectar cuando presione Finalizar"
 
-#: ../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: Asistente para crear una cuenta"
 
-#: ../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 "Ya tengo una cuenta y quiero usarla"
 
-#: ../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 "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../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:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../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
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Pro_xy"
 
-#: ../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:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
-#: ../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 "Definir mi perfil cuando me conecte"
 
-#: ../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
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Usar nombre de host y puerto personalizados"
 
-#: ../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."
 msgstr "Debes tener una cuenta antes de conectar a la red Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-msgid "Your JID:"
-msgstr "Tu JID"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:23
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Nombre del host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
-#: ../data/glade/account_modification_window.glade.h:50
+#: ../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 "ID de _Jabber: "
+
+#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_modification_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:16
-msgid "_Username:"
-msgstr "_Nombre"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -197,18 +201,16 @@ msgstr "<b>Miscelánea</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información personal</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Cuenta"
 
@@ -217,23 +219,22 @@ msgid "Account Modification"
 msgstr "Modificar cuenta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Operaciones de administración"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Autoreconectar si se pierde la conexión"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar al inicio de Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Cam_biar contraseña"
 
@@ -249,39 +250,37 @@ msgstr ""
 "en el servidor, y que con esta opción se desactiva el TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Elegir _clave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Click para cambiar la contraseña de la cuenta"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Haz click para solicitar una autorización a todos los contactos para una "
 "nueva cuenta"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Conexión"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "_Editar información personal personales..."
 
 #. 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:1034
-#: ../src/common/helpers.py:1046 ../src/notify.py:515 ../src/notify.py:546
-#: ../src/notify.py:558
+#: ../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"
 
@@ -289,17 +288,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2654
-#: ../src/roster_window.py:5137
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "General"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nombre del host:"
 
@@ -322,7 +318,6 @@ msgstr ""
 "prevenir desconexiones por expiración"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -332,7 +327,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -342,7 +336,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -358,9 +351,8 @@ msgid "Information about you, as stored in the server"
 msgstr "Información acerca de tí a guardar en el servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1611
-#: ../src/config.py:2111
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
@@ -370,35 +362,34 @@ msgstr "Ninguna clave seleccionada"
 #. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1162
-#: ../src/config.py:1251 ../src/config.py:1519 ../src/config.py:1524
-#: ../src/config.py:2019 ../src/config.py:2097 ../src/config.py:2110
-#: ../src/config.py:3201 ../src/config.py:3269 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2723
-#: ../src/roster_window.py:2729 ../src/roster_window.py:2734
+#: ../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 "Ninguno"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Información personal"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Puerto: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Pr_ioridad:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -409,7 +400,7 @@ msgstr ""
 "cuenta. El cliente con mayor prioridad recibe los eventos."
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "La prioridad cambiará automáticamente acorde a tu estado."
 
@@ -418,12 +409,12 @@ msgid "Proxy:"
 msgstr "Proxy"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Re_curso: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -439,30 +430,25 @@ msgstr ""
 "eventos (mira más abajo)."
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar contraseña (inseguro)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Sincronizar contactos"
@@ -472,21 +458,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (el viejo)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para las transferencias de archivo"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Ajustar al estado"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 msgid "_Name:"
 msgstr "_Nombre: "
 
@@ -494,11 +475,21 @@ msgstr "_Nombre: "
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Ajustar al estado"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Cuentas"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usar autentificación"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -506,21 +497,18 @@ msgstr ""
 "Marca esto para que Gajim te pregunte antes de enviar tu contraseña a través "
 "de una conexión no segura."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onectar al inicio de Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Correo-e:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Nombre:"
 
@@ -530,7 +518,6 @@ msgstr ""
 "Si está marcado, Gajim obtendrá la contraseña de un agente GPG como seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -542,56 +529,98 @@ msgstr ""
 "firewall."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Apellido(s):"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Combinar las cuentas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5088
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Enviar paquetes de mantenimiento de actividad"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Usar _agente GPG"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Usar nombre de host y puerto personalizados"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Usar puerto personalizado:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "_Editar información personal personales..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Activar"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nombre del host:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Gestionar..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Puerto:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Advertir antes de usar una conexión no segura"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "usar variable de entorno HTTP_PROXY"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "usar variable de entorno HTTP_PROXY"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Cuenta:"
@@ -776,7 +805,7 @@ msgid "All statuses"
 msgstr "Todos los estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:290
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Ausente"
 
@@ -793,7 +822,7 @@ msgid "Have "
 msgstr "Tiene "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -802,7 +831,7 @@ msgid "Launch a command"
 msgstr "Lanzar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -924,7 +953,7 @@ msgstr "Última modificación:"
 msgid "New entry received"
 msgstr "Nueva entrada recibida"
 
-#: ../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 "Has recibido una nueva entrada:"
 
@@ -968,11 +997,19 @@ msgstr "Introduce nueva contraseña:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Escribe tu nuevo mensaje de estado</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 "Actividad:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Estado de ánimo:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Mensajes predefinidos:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Guardar como predefinido..."
 
@@ -1032,11 +1069,11 @@ msgstr "_Añadir a la lista de contactos"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1184,7 +1221,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:743
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1204,11 +1241,11 @@ msgstr "Personalización de temas de Gajim"
 msgid "Gone"
 msgstr "Me fui"
 
-#: ../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 "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:744
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Cursiva"
 
@@ -1256,7 +1293,7 @@ msgstr "Cambiar el _tema"
 msgid "Configure _Room..."
 msgstr "Configurar el salón"
 
-#: ../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 "_Marcador"
 
@@ -1288,23 +1325,37 @@ msgstr "_Administrar"
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../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 "_Bloquear"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Miembro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../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 "_Desbloquear"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1312,13 +1363,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear nuevo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:315
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tema"
 
@@ -1337,7 +1388,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenido al gestor de históricos de Gajim</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 "Eliminar"
 
@@ -1390,7 +1442,7 @@ msgstr "Buscar"
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
-#: ../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 "Entrar a un salón de chat"
 
@@ -1417,8 +1469,8 @@ msgstr "Recientemente:"
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1446,7 +1498,7 @@ msgstr "Minimizar al ingresar automáticamente"
 msgid "Print status:"
 msgstr "Mostrar estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1476,11 +1528,6 @@ msgstr "<b>Configuración</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
 #, fuzzy
-msgid "B_OSH Port:"
-msgstr "_Puerto:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1489,46 +1536,47 @@ msgstr ""
 "Conexión HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Name:"
-msgstr "Nombre:"
-
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Contraseña: "
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:8
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:9
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Puerto:"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "Type:"
-msgstr "Tipo:"
-
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:10
 #, fuzzy
-msgid "Use HTTP proxy"
+msgid "Use HTTP prox_y"
 msgstr "_Usar proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/glade/manage_proxies_window.glade.h:11
 #, fuzzy
-msgid "Use proxy authentication"
+msgid "Use proxy auth_entication"
 msgstr "Usar autentificación"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Nombre"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Añade éste contacto al roster (Ctrl+D)"
@@ -1577,7 +1625,7 @@ msgstr "Muestra el perfil del contacto (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 "_Enviar"
 
@@ -1675,10 +1723,14 @@ msgstr ""
 "ocupado o invisible."
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1692,19 +1744,19 @@ msgstr ""
 "Siempre usar las aplicaciones por defecto de XFCE\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Mensaje de conversación:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Comprobar al inicio si Gajim es el cliente de Jabber por defecto"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Configurar colores y fuentes de la interfaz"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1718,31 +1770,31 @@ msgstr ""
 "Roster desacoplado con conversaciones agrupadas por cuenta\n"
 "Roster desacoplado con conversaciones agrupadas por tipo"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Mostrar la _actividad de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Mostrar detalles _extra en los correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostrar _ajustes de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los a_vatares de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los _mensajes de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1752,7 +1804,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación quieres que se muestren en las ventanas."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1762,7 +1814,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación enviar a la potra parte."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1770,11 +1822,11 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta los botones en las ventanas de conversación."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1782,7 +1834,7 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1790,14 +1842,14 @@ msgstr ""
 "Si está marcado, Gajim también incluirá información acerca del remitente de "
 "los nuevos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Si está marcado, Gajim cambiará el estado a Ausente cuando el ordenador no "
 "esté en uso"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1805,7 +1857,7 @@ msgstr ""
 "Si está marcado, Gajim cambiará el estado a no disponible cuando el "
 "ordenador ya no se use"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1813,7 +1865,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
 "grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1821,26 +1873,26 @@ msgstr ""
 "Si está marcado, Gajim mostrará los mensajes de estado de los contactos bajo "
 "el nombre de contacto en el roster y grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará la actividad de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
 "roster"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará los ajustes de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1850,7 +1902,7 @@ msgstr ""
 "ventanas de conversación. Si no se definió ningún idioma vía botón derecho "
 "en el campo de entrada, será usado el idioma por defecto."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1860,7 +1912,7 @@ msgstr ""
 "autorizados. Úsalo con precaución ya que bloqueará todos los mensajes de "
 "cualquier contacto que no esté en tu lista de contactos."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1870,7 +1922,7 @@ msgstr ""
 "cuenta que usando cifrado E2E, la parte remota tiene que aceptar al "
 "ingresar, o los mensajes no serán registrados."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1878,7 +1930,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará una notificación cuando se reciba un nuevo "
 "correo vía GMail"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1888,7 +1940,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1896,7 +1948,7 @@ msgstr ""
 "Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
 "mensaje por defecto especificado."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1904,43 +1956,50 @@ msgstr ""
 "Si no está deshabilitado, Gajim reemplazará emoticonos ascii ':)' por su "
 "equivalente en iconos gráficos estáticos o animados"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "R_egistrar conversación cifrada"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Hacer compacta la ventana de mensajes"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Gestio_nar..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Notif_icarme de los contactos que se conecten"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Notificar de nuevos correos de _GMail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Eventos personales"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1950,19 +2009,24 @@ msgstr ""
 "Notificarmelo\n"
 "Mostrar sólo en roster"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Mostrar evento en systray"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1970,139 +2034,145 @@ msgstr ""
 "Algunos mensajes pueden incluir contenido enriquecido (formato, colores "
 "etc). Si está marcado, Gajim mostrará el mensaje en bruto."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Set de _iconos de estado:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "El mensje de autoestado ausente. Si está vacío, Gajim no cambiará el mensaje "
 "de estado actual"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "El mensaje de autoestado no disponible. Si está vacío, Gajim no cambiará el "
 "mensaje de estado actual"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Usar iconos de _transporte"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Usar pre_definido del sistema"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Cuando se recibe un nuevo evento:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "_Ausente tras:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Mostrar notificaciones de estado de la conversación:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Emoticonos:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "A_dministrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar contenido enriquecido en mensajes entrantes"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Mens_aje entrante:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "_No disponible tras:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "Enviar notificaciones del estado de la conversación:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Men_saje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "Resaltado de _URL:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Comportamiento de la ventana:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "en _grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "en _roster"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutos"
 
@@ -2150,7 +2220,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orden:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2572
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
@@ -2215,108 +2285,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Compañía:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>País:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Departamento:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Correo-e:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Segunda dirección:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Familia:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Nombre completo</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Apodo:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Página web:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Medio:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Nombre:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Alias:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Número de teléfono:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Posición:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Código postal:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefijo:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Rol:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Estado:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Calle:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufijo:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Acerca de"
 
@@ -2326,17 +2396,17 @@ msgstr "Click para definir tu avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Información personal"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Trabajo"
 
@@ -2354,8 +2424,8 @@ msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5125
-#: ../src/roster_window.py:5603 ../src/roster_window.py:5732
+#: ../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 "_Eliminar"
 
@@ -2377,14 +2447,14 @@ msgstr "Editar _grupos..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5675
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5556
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_vitar a"
 
@@ -2394,7 +2464,7 @@ msgstr "_Eliminar"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5053 ../src/roster_window.py:5641
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Envía estado personalizado"
 
@@ -2419,12 +2489,6 @@ msgstr "Iniciar conversación"
 msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5116 ../src/roster_window.py:5593
-#: ../src/roster_window.py:5722
-msgid "_Block"
-msgstr "_Bloquear"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
@@ -2446,16 +2510,33 @@ msgstr "_Renombrar..."
 msgid "_Subscription"
 msgstr "_Subscripción"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5587
-#: ../src/roster_window.py:5719
-msgid "_Unblock"
-msgstr "_Desbloquear"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_No ignorar"
 
+#: ../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 "gtk-delete"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+msgid "gtk-ok"
+msgstr ""
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Añadir contacto..."
@@ -2481,56 +2562,62 @@ msgid "Profile, A_vatar"
 msgstr "Perfil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Mostrar contactos desconectados"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Cuentas"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "E_nviar mensaje..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Ver"
 
@@ -2547,11 +2634,11 @@ msgid "_Add contact"
 msgstr "Añadir un _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5744
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Información"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2639,10 +2726,6 @@ msgstr "Petición de adición"
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Selecciona la cuenta con la que sincronizar"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Selecciona la cuenta con la que quieres sincronizar"
@@ -2667,10 +2750,6 @@ msgstr "Enviar mensaje"
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Mostrar _roster"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Es_tado"
@@ -2688,49 +2767,54 @@ msgstr "<b>Pregunta:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Cliente:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Estado:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>ID de Jabber:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Recurso:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Estado:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Suscripción:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Avatar configurado:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Más"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Avatar del usuario:"
 
@@ -2742,6 +2826,11 @@ msgstr "<b>Tráfico de Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activar"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2770,13 +2859,13 @@ msgstr "Asignar clave OpenPGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "Renombrar"
 
@@ -2800,29 +2889,25 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Modificar cuenta"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Cancelar información"
 
-#: ../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 "Hay un comando en ejecución. ¿Realmente quieres cancelarlo?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "El servicio cambió el identificador de la sesión"
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "El servicio envió información malformada"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "El servicio cambió el identificador de la sesión"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "El servicio devolvió un error"
 
@@ -2847,7 +2932,7 @@ msgstr "Entero"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:763
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Color"
 
@@ -2872,175 +2957,198 @@ msgstr "(Ninguno)"
 msgid "Hidden"
 msgstr "Oculta"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Has recibido una nueva entrada:"
+
 #. 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 "Inglés"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Bieloruso"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Griego"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Británico"
 
-#: ../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 "Español"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Euskera"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Noruego (b)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Portugués de Brasil"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:358 ../src/chat_control.py:546
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:359 ../src/chat_control.py:547
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/chat_control.py:745
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Indefinido"
 
-#: ../src/chat_control.py:746
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Servicio"
 
-#: ../src/chat_control.py:769
+#: ../src/chat_control.py:796
 #, fuzzy
 msgid "Font"
 msgstr "_Fuente:"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:1212 ../src/chat_control.py:1614
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "¿Enviar fichero?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Si envías un archivo a %s, el/ella sabrá tu ID de Jabber real."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Cifrado GPG habilitado"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1241 ../src/chat_control.py:2108
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:72
-#: ../src/common/helpers.py:302 ../src/conversation_textview.py:860
-#: ../src/dialogs.py:903 ../src/gajim.py:980 ../src/gajim.py:1640
-#: ../src/normal_control.py:483 ../src/roster_window.py:911
-#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1870 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3115 ../src/roster_window.py:5237
-#: ../src/roster_window.py:5422
+#: ../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 "no está en el roster"
 
-#: ../src/chat_control.py:1373 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Una lista de transferencias activas, finalizadas y detenidas"
+
+#: ../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 "Artista desconocido"
 
-#: ../src/chat_control.py:1375 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Título desconocido"
 
-#: ../src/chat_control.py:1377 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Recurso desconocido"
 
-#: ../src/chat_control.py:1381 ../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"
@@ -3049,26 +3157,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1386
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s por %(artist)s\n"
-"de %(source)s"
-
-#: ../src/chat_control.py:1509
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s del salón %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1594 ../src/dialogs.py:3913
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/chat_control.py:1595
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3076,50 +3175,50 @@ msgstr ""
 "No se ha asignado ninguna clave GPG a este contacto. Por tanto no podrás "
 "cifrar mensajes con GPG."
 
-#: ../src/chat_control.py:1604
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Cifrado GPG deshabilitado"
 
-#: ../src/chat_control.py:1629
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "La sesión SERÁ registrada"
 
-#: ../src/chat_control.py:1631
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "La NO SERÁ registrada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1645
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "es"
 
-#: ../src/chat_control.py:1645
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NO es"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "no será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "y autentificado"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "y NO autenticado"
 
 #. 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:1661
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3128,26 +3227,26 @@ msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: ../src/chat_control.py:1709
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Comando no soportado por la cuenta zeroconf."
 
-#: ../src/chat_control.py:1720 ../src/groupchat_control.py:1654
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1668
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1673
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, oculta los botones de conversación."
 
-#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1689
+#: ../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 "
@@ -3156,38 +3255,38 @@ msgstr ""
 "Uso: /%(command)s <action>, envía action al actual grupo de charla. Usa una "
 "tercera persona (p.ej. /%(command)s explota.)"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uso: /%s, envía un ping al contacto"
 
-#: ../src/chat_control.py:1737
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uso: /%s, envía el mensaje al contacto"
 
-#: ../src/chat_control.py:1740 ../src/groupchat_control.py:1712
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay información de ayuda para /%s"
 
-#: ../src/chat_control.py:1872
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: ../src/chat_control.py:1879
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: ../src/chat_control.py:1884
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: ../src/chat_control.py:1889
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3195,25 +3294,25 @@ msgstr ""
 "No se verificó la identidad del contacto remoto. Click en el botón del "
 "escudo para más detalles."
 
-#: ../src/chat_control.py:1891
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: ../src/chat_control.py:1919 ../src/chat_control.py:1932
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "El siguiente mensaje NO fue cifrado"
 
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "El siguiente mensaje fue cifrado"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2296
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:2297
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3221,15 +3320,15 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/chat_control.py:2445 ../src/common/connection_handlers.py:1850
-#: ../src/common/connection_handlers.py:1896
-#: ../src/common/connection_handlers.py:2084
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1260
-#: ../src/gajim.py:178
+#: ../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 "Error en la base de datos"
 
-#: ../src/chat_control.py:2446
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3238,7 +3337,7 @@ msgstr ""
 "No se pudo leer el archivo de base de datos (%s). Intenta repararlo o "
 "elimínalo (se perderá todo el histórico)."
 
-#: ../src/chat_control.py:2682
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
@@ -3247,159 +3346,171 @@ msgstr "%(name)s está ahora %(status)s"
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../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 es un archivo pero podría ser un directorio"
 
-#: ../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 se cerrará ahora"
 
-#: ../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 es un directorio pero podría ser un archivo"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Cambiar información de estado"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Cambiar estado"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Definir la presencia y una descripción"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "En línea"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "No molestar."
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Desconectado"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Descripción de la presencia:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Se ha cambiado el estado."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Abandonar grupos de charla"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s en %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "No has entrado al grupo de charla"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Elige los grupos de conversación que quieres abandonar"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:72 ../src/roster_window.py:785
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:5013
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Grupos de charla"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Abandonaste los siguientes grupos de charla:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Reenviar mensajes sin leer"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Todos los mensajes sin leer han sido reenviados"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus y el demonio notificador para mostrar notificaciones"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tiempo en minutos, después de haber cambiado a ausente"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Ausente por estar inactivo más de $T minutos)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S será reemplazado por el mensaje de estado actual, $T por tiempo de auto-"
 "ausencia"
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tiempo en minutos, después de haber cambiado a no disponible"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (No disponible por estar inactivo más de $T minutos)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S será reemplazado por el actual mensaje de estado, $T por tiempo de auto-"
 "ausencia extendida"
 
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
 # duda sobre collapsed
-#: ../src/common/config.py:111
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:461
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3128
+#: ../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 "por defecto"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Habilitar mensajería de enlace local / zeroconf"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Lenguaje usado por el corrector"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3409,7 +3520,7 @@ msgstr ""
 "'a veces' - muestra la hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca muestra la hora."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3419,18 +3530,18 @@ msgstr ""
 "a 4, o 0 para deshabilitar el reloj hablado. 1 es el reloj más preciso, 4 el "
 "menos. Sólo se usa si print_time está definido como 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar los pares de * / _ como posibles caracteres de formateo."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si es True, no elimiina */_ . Entonces *abc* será negrita, pero sin eliminar "
 "* *"
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3441,7 +3552,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (If you want to use this, install "
 "docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3449,7 +3560,7 @@ msgstr ""
 "Carácter a añadir tras el alias cuando se usa completado de alias (tab) en "
 "los grupos de charla."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3457,7 +3568,7 @@ msgstr ""
 "Carácter a proponer para añadir tras el alias deseado cuando el alias "
 "deseado está siendo usado por alguien en el grupo de charla."
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3468,19 +3579,19 @@ msgstr ""
 "de Python acerca de strftime y para más detalles: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Los caracteres que se imprimen antes del alias en las conversaciones"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Los caracteres que se imprimen después del alias en las conversaciones"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3488,12 +3599,12 @@ msgstr ""
 "Cuántas líneas recordar de la última conversación cuando se vuelve a abrir "
 "una pestaña/ventana de conversación"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Cuántos minutos debe durar la última línea de la conversación anterior."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3501,11 +3612,11 @@ msgstr ""
 "Envía un mensaje con Ctrl+Intro y con Intro hace un nuevo renglón (Al estilo "
 "del cliente Mirabilis ICQ)"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cuántas líneas almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3514,12 +3625,12 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si está marcado, Gajim puede ser controlado remotamente usando gajim-remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3531,13 +3642,13 @@ msgstr ""
 "puesto en False y sincronicen con el estado global) basados en el estado de "
 "la conexión de la red."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificaciones de estado enviadas. Puede ser all, composing_only o disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3545,7 +3656,7 @@ msgstr ""
 "Las notificaciones de estado mostradas en las ventanas de conversación. "
 "Pueden ser all, composing_only o disabled."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3553,11 +3664,11 @@ msgstr ""
 "Cuando no se muestra la hora en cada mensaje (print_time==sometimes), la "
 "muestra cada x minutos."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de cerrar una ventana/petaña de salón de charla."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3565,7 +3676,7 @@ msgstr ""
 "Preguntar siempre antes de cerrar la ventana/pestaña de un grupo de charla "
 "en esta lista (separada por espacios) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3574,7 +3685,13 @@ msgstr ""
 "conversación en esta lista (separada por espacios) de ID de Jabber de grupos "
 "de charla."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3583,35 +3700,27 @@ msgstr ""
 "locales, para las transferencias de archivos en caso redirección de puerto o "
 "interpretación de la dirección."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Según el estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica eventos en el área de notificación."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "¿Mostrar borde solapado de archivador en las ventanas de conversación?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
-"tus mensajes sean registrados?"
-
-#: ../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 "
@@ -3623,18 +3732,18 @@ msgstr ""
 "válidos. Los números más altos son los más seguros pero demoran más tiempo "
 "en el cálculo cuando inicias una sesión."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "¿Previsualizar nuevos mensajes en un mensaje emergente?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en los grupos "
 "de charla."
 
-#: ../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."
@@ -3643,14 +3752,14 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Si es True, Gajim comprueba si es el cliente Jabber por defecto en cada "
 "inicio."
 
-#: ../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."
@@ -3658,7 +3767,7 @@ msgstr ""
 "Si es True, Gajim mostrará un icono en cada pestaña que contenga mensajes "
 "sin leer. Dependiendo del tema, este icono puede ser animado."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3666,12 +3775,12 @@ msgstr ""
 "Si es True, Gajim mostrará el mensaje de estado, si no está vacío, para cada "
 "contacto bajo su nombre de contacto en ela ventana del roster."
 
-#: ../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 ""
 "Definir la posición del avatar en el roster. Puede ser izquierda o derecha"
 
-#: ../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."
@@ -3679,7 +3788,7 @@ msgstr ""
 "Si es True, Gajim pedirá un avatar a cada contacto que no tuvo un avatar la "
 "última vez o se tiene guardado uno demasiado antiguo."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3687,7 +3796,7 @@ msgstr ""
 "Si es False, Gajim nunca más mostrará la línea de estado cuando un contacto "
 "cambie su estado o su mensaje de estado"
 
-#: ../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 "
@@ -3701,30 +3810,30 @@ msgstr ""
 "mensajes de estado. Si es \"in_and_out\", Gajim sólo mostrará las entradas y "
 "salidas en el grupo de conversación."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Color de fondo para los contactos que acaban de conectar."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Color de fondo para los contactos que acaban de desconectar."
 
-#: ../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 ""
 "Si es True, los mensajes restaurados usarán una fuente más pequeña que la "
 "predefinida."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "No mostrar avatar para el transporte en sí mismo"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "No mostrar roster en la barra de tareas."
 
-#: ../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 "
@@ -3733,7 +3842,7 @@ msgstr ""
 "Si es True y las versiones instaladas de GTK+ y PyGTK son al menos 2.8, hace "
 "a la ventana resaltarse cuando se tienen eventos pendientes."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3744,7 +3853,7 @@ msgstr ""
 "detener el envío de información sha en el grupo de conversación."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3764,31 +3873,31 @@ msgstr ""
 "'pertype' - Cada tipo de mensaje (p.ej. conversaciones vs. grupos de charla) "
 "se envian a una ventana específica."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Si es False, no verás más el avatar en la ventana de conversación."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Si es True, presionar la tecla escape cierra una ventana/pestaña."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Esconde los botones en las ventanas de conversación"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta el banner en una ventana de grupo de charla"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta el banner en una ventana de conversación de dos personas."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta los ocupantes en las ventans de grupo de charla."
 
-#: ../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."
@@ -3796,15 +3905,15 @@ msgstr ""
 "En una conversación, muestra el alias al principio de una línea sólo cuando "
 "no es la misma persona que envió el último mensaje."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentar cuando se use una combinación de alias consecutivos."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Desplazamiento suave del mensaje en las ventanas de conversación"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3812,13 +3921,13 @@ msgstr ""
 "Lista de colores, separados por \":\", que serán usados para colorear alias "
 "en los grupos de charla."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce a la próxima pestaña de composición cuando ninguno está sin "
 "leer."
 
-#: ../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."
@@ -3826,7 +3935,7 @@ msgstr ""
 "¿Debemos mostrar la confirmación de la creación de metacontactos o no? Una "
 "secuencia vacía significa que nunca se mostrará."
 
-#: ../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 "
@@ -3836,7 +3945,7 @@ msgstr ""
 "ventana de modificación de cuenta. TEN CUIDADO, cuando estás conectado con "
 "una prioridad negativa, NO recibirás ningún mensaje de tu servidor."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3844,7 +3953,16 @@ msgstr ""
 "Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
 "las contraseñas de la cuenta."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
+"las contraseñas de la cuenta."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3852,7 +3970,7 @@ msgstr ""
 "Si es True, Gajim mostrará el número de contactos totales y en línea en los "
 "títulos de la cuenta y los grupos."
 
-#: ../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"
@@ -3860,7 +3978,7 @@ msgstr ""
 "Puede estar vacío, 'chat' o 'normal. Si no está vacío, tratará todos los "
 "mensajes entrantes como si fueran de este tipo"
 
-#: ../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."
@@ -3868,7 +3986,7 @@ msgstr ""
 "Si es True, Gajim mostrará y seleccionará el contacto que te envió el último "
 "mensaje, si la ventana de conversación no ha sido abierta aún."
 
-#: ../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."
@@ -3876,11 +3994,11 @@ msgstr ""
 "Si es True, Gajim convertirá la cadena entre $$ y $$ a una imagen usando "
 "dvips y convert antes de insertarla en una ventana de conversación."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tiempo de inactividad necesario antes de cerrar la ventana de estado."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3888,7 +4006,7 @@ msgstr ""
 "Número máximo de líneas mostradas en las conversaciones. Las más antiguas "
 "serán limpiadas."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3896,11 +4014,11 @@ msgstr ""
 "Si es True, las ventanas de notificación del deminio notificador serán "
 "adjuntadas al área de notificación."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
 
-#: ../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."
@@ -3908,16 +4026,22 @@ msgstr ""
 "Cambiar el valor para cambiar el tamaño de las fórmulas latex visualizadas. "
 "El mayor es el más grande."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Combinaciones de uri válidas. Sólo las combinaciones de esta lista serán "
 "aceptadas como uri \"real\"."
 
-#: ../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."
@@ -3925,7 +4049,7 @@ msgstr ""
 "La prioridad cambiará automáticamente acorde a tu estado. Las prioridades "
 "están definidas en las opciones de autoprioridad_*"
 
-#: ../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"
@@ -3934,27 +4058,27 @@ msgstr ""
 "invisible. NOTA: esta opción se usa sólo si restore_last_status está "
 "desactivado"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Si está activado, restaurar el último estado que fue usado"
 
-#: ../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 ""
 "Si está desactivado, no firmar presencias con la clave GPG, incluso si GPG "
 "está configurado."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Activar cifrado ESessions para esta cuenta."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "¿Gajim debería iniciar automáticamente una sesión cifrada cuando sea posible?"
 
-#: ../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"
@@ -3962,35 +4086,44 @@ msgstr ""
 "Lista ordenada (separada por espacios) de tipos de conexión para probar. "
 "Puede contener tls, ssl o plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Muestra un aviso antes de usar la librería SSL estándar"
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espacios de errores ssl a ignorar."
 
-#: ../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
+#, fuzzy
 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 ""
 "Cuántos segundos eseprar una respuesta de paquetes de mantenimiento de "
 "actividad antes de  intentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Corrección 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."
@@ -3998,19 +4131,27 @@ msgstr ""
 "Si está marcado, Gajim usará tu IP y proxies definidos en la opción "
 "file_transfer_proxies para tu transferencia."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Contestar peticiones recibidas"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Enviar peticiones recibidas"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
+"tus mensajes sean registrados?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4018,101 +4159,101 @@ msgstr ""
 "¿Debería Gajim iniciar automáticamente una sesión cifrada con este contacto "
 "cuando sea posible?"
 
-#: ../src/common/config.py:404 ../src/common/config.py:407
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "estado separado por espacios o all"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:415 ../src/common/config.py:417
-#: ../src/common/config.py:418 ../src/common/config.py:421
-#: ../src/common/config.py:422
+#: ../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' o ''"
 
-#: ../src/common/config.py:428 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:430 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:432 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: ../src/common/config.py:440 ../src/config.py:1451
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: ../src/common/config.py:443 ../src/common/config.py:444
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4121,78 +4262,99 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: ../src/common/config.py:455
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: ../src/common/config.py:464 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:468 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:72
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Host erróneo"
 
-#: ../src/common/connection_handlers.py:235
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "¿Dirección local no válida? :-O"
 
-#: ../src/common/connection_handlers.py:640
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "La información de registro para el transporte %s no llegó a tiempo"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2215 ../src/common/connection.py:1258
-#: ../src/gajim.py:400
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "vCard publicada con éxito"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "falló la publicación de la vCard"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Error de escritura en disco"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:880
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:881
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "La cuenta %s no soporta invisibilidad."
 
-#: ../src/common/connection_handlers.py:1689 ../src/common/connection.py:1115
-#: ../src/config.py:1873 ../src/config.py:1881 ../src/config.py:1924
-#: ../src/config.py:3139 ../src/dataforms_widget.py:536 ../src/dialogs.py:2358
+#: ../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 "ID de Jabber no válida"
 
-#: ../src/common/connection_handlers.py:1690
+#: ../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:1851
-#: ../src/common/connection_handlers.py:1897
-#: ../src/common/connection_handlers.py:2085
-#: ../src/common/connection_handlers.py:2218 ../src/common/connection.py:1261
-#: ../src/gajim.py:179
+#: ../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."
@@ -4202,78 +4364,77 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) o elimínalo (se perderá todo el "
 "histórico)."
 
-#: ../src/common/connection_handlers.py:1969
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alias no permitido: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2057 ../src/gajim.py:563
+#: ../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 "No se pudo entrar al grupo de charla"
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Estás baneado del grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "La creación de grupos de charla está restringida."
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Tu alias registrado podría estar en uso en el grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2058
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "No estás en la lista de miembros del grupo de charla %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "El salón ha sido destruido"
 
-#: ../src/common/connection_handlers.py:2107
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puedes unirte a este salón en su lugar: %s"
 
-#: ../src/common/connection_handlers.py:2134
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2157
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2341
+#: ../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 "
@@ -4284,15 +4445,15 @@ msgstr ""
 "eliminarlo"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2366
-#: ../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 "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../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 "Te conectarás a %s sin OpenPGP"
@@ -4425,76 +4586,81 @@ msgstr "El uso de la clave no incluye la firma de certificados"
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: ../src/common/connection.py:267
-#: ../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 "Se ha perdido la conexión de la cuenta \"%s\""
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El servidor %(name)s contestó incorrectamente a la petición de registro: %"
 "(error)s"
 
-#: ../src/common/connection.py:313
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: ../src/common/connection.py:326
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Respuesta no válida"
 
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "El transporte %(name)s respondió incorrectamente a la petición de registro: %"
 "(error)s"
 
-#: ../src/common/connection.py:629 ../src/common/connection.py:743
-#: ../src/common/connection.py:1393
-#: ../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 "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:630 ../src/gajim.py:1057
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/common/connection.py:639
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Guardado en: %s"
+
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/common/connection.py:670 ../src/common/connection.py:723
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: ../src/common/connection.py:671 ../src/common/connection.py:724
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Se perdió la conexión con la cuenta %s. Reintentando la conexión."
 
-#: ../src/common/connection.py:693
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "La autenticidad del certificado %s podría no ser válida."
 
-#: ../src/common/connection.py:696
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4503,7 +4669,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:698
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4512,25 +4678,25 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: ../src/common/connection.py:744
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:769
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:771
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
-#: ../src/common/connection.py:832
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Error eliminando la lista de privacidad"
 
-#: ../src/common/connection.py:833
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4539,30 +4705,30 @@ msgstr ""
 "La lista de privacidad %s no se ha eliminado. Podría estar activa en uno de "
 "tus recursos conectados. Desactívalo y prueba de nuevo."
 
-#: ../src/common/connection.py:1116 ../src/dialogs.py:2359
+#: ../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 "No es posible enviar archivos vacíos"
 
-#: ../src/common/connection.py:1137
-#: ../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 "Ni la presencia remota ha sido firmada, ni se ha asignado una clave"
 
-#: ../src/common/connection.py:1139
-#: ../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 "La clave del contacto (%s) no coincide con la clave asignada en Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1148
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:1248
-#: ../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"
@@ -4571,20 +4737,30 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1426
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Invitar _Contactos"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:72
-#: ../src/gajim.py:980
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:72 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1349 ../src/gajim.py:809 ../src/roster_window.py:815
-#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
+#: ../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 "Transportes"
 
@@ -4593,11 +4769,11 @@ msgid "Not in roster"
 msgstr "No está en el roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Los enlaces D-Bus de python no se encuentran en este ordenador"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Las capacidades D-Bus de Gajim no pueden ser usadas"
 
@@ -4627,1033 +4803,1043 @@ msgstr ""
 "Bus de la sesión no disponible.\n"
 "Prueba leyendo http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "doce"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "uno"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dos"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tres"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "cuatro"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "cinco"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "seis"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "siete"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "ocho"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nueve"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "diez"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "once"
 
+#. 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 "doce"
-
-#. 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 en punto"
+msgid "%(0)s o'clock"
+msgstr "%(0)s en punto"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 y cinco"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s y cinco"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 y diez"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s y diez"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 y cuarto"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s y cuarto"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 y veinte"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s y veinte"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 y veinticinco"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s y veinticinco"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 y media"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s y media"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$1 menos veinticinco"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(1)s menos veinticinco"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "$1 menos veinte"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "%(1)s menos veinte"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "$1 menos cuarto"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "%(1)s menos cuarto"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "$1 menos diez"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "%(1)s menos diez"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "$1 menos cinco"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "%(1)s menos cinco"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 en punto"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s en punto"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noche"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Madrugada"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Mañana"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Media mañana"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Mediodía"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Noche"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Noche"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Inicio de semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Mitad de semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Final de semana"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:215
-#, python-format
-msgid "%s GiB"
-msgstr ""
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:218
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:222
-#, python-format
-msgid "%s MiB"
-msgstr ""
-
-#. MB means megabyte
-#: ../src/common/helpers.py:225
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:229
-#, python-format
-msgid "%s KiB"
-msgstr ""
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:232
-#, python-format
-msgid "%s KB"
-msgstr ""
-
-#. B means bytes
-#: ../src/common/helpers.py:235
-#, python-format
-msgid "%s B"
-msgstr ""
-
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:283 ../src/features_window.py:119
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:311
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:313
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "está escribiendo..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:409
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
-#: ../src/common/helpers.py:983 ../src/common/helpers.py:990
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr ""
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr ""
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr ""
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr ""
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensaje pendiente"
 msgstr[1] "%d mensajes pendientes"
 
-#: ../src/common/helpers.py:996
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " del salón %s"
 
-#: ../src/common/helpers.py:999 ../src/common/helpers.py:1018
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " del usuario %s"
 
-#: ../src/common/helpers.py:1001
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1015
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1048
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Error ejecutando \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s no es un nivel de registro válido"
+
 #. 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 "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Cuenta de Gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "de la cuenta %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Miedoso"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Impresionado"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Amoroso"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Enfadado"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Molesto"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Despierto"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Avergonzado"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Animado"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Calmado"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Cauto"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Frío"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Confiado"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Confuso"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Contemplativo"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Contento"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Irritable"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Alocado"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Creativo"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Curioso"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Desanimado"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Deprimido"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Decepcionado"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Disgustado"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Consternado"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Distraído"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Vergonzoso"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Envidioso"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Flirteador"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustrado"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Agradecido"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Dolido"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Malhumorado"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Culpable"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Deseoso"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Caliente"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Humilde"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Humillado"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Hambriento"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Dolido"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Impresionado"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Atemorizado"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Indignado"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Curioso"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Intoxicado"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Solitario"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Perdido"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Afortunado"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Significante"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Malhumorado"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nervioso"
 
-#: ../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 "Ofendido"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Escandalizado"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Juguetón"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Orgulloso"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Relajado"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Aliviado"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Arrepentido"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Inquieto"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarcástico"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Satisfecho"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Serio"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Horrorizado"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Tímido"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Enfermo"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Adormilado"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Espontáneo"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Estresado"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Fuerte"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Sorprendido"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Agradecido"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Sediento"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Cansado"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Indefinido"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Débil"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Preocupado"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Haciendo tareas"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Haciendo la compra"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Limpiando"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Cocinando"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Tareas de mantenimiento"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Fregando los platos"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Haciendo la colada"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Arreglando el jardín"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Haciendo un recado"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Paseando al perro"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Bebiendo"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Tomando una cerveza"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Tomando café"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Tomando té"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Tomando un tentempié"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Desayunando"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Cenando"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Almorzando"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Haciendo ejercicio"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Montando en bici"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Bailando"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Paseando"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Corriendo"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Haciendo deporte"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Corriendo"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Esquiando"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Nadando"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Trabajando"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Lavando"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "En el spa"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Lavando los dientes"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Cortando el pelo"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Afeitándome"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Tomando un baño"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Duchándome"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "En una cita"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Fin del día"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Saliendo por ahi"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Escondiéndome"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "De vacaciones"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Rezando"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Vacaciones planificadas"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Pensando"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Relajándome"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Pescando"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Jugando"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Saliendo"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "De fiesta"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Leyendo"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Ensayando"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Comprando"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Fumando"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Socializándome"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "En el solarium"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Viendo la TV"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Viendo una película"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Hablando"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "En la vida real"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Al teléfono"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Al videoteléfono"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Viajando"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Conmutar"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Conduciendo"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "En el coche"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "En el bus"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "En el avión"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "En el tren"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "En un viaje"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Caminando"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Programando"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "En un encuentro"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Estudiando"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Escribiendo"
 
@@ -5672,7 +5858,7 @@ msgstr ""
 "cancelada."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5688,16 +5874,16 @@ msgstr ""
 "El host %s que configuraste como la opción avanzada ft_override_host_to_send "
 "no es válido, será ignorado."
 
-#: ../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 ""
 "Para continuar enviando y reciviendo mensajes, necesitarás volver a conectar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Error de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5706,31 +5892,31 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprueba si Avahi o Bonjour están instalados."
 
-#: ../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 "No se pudo iniciar servicio local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %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 "Por favor, comprueba si avahi-daemon se encuentra en ejecución."
 
-#: ../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 "No se pudo cambiar el estado de la cuenta \"%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."
@@ -5739,65 +5925,49 @@ msgstr ""
 "enviado."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está cifrado]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:480
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "El contacto está desconectado. Tu mensaje no pudo ser enviado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:585
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "No se pudo establecer la conexión al host: Expiró enviando información."
 
-#: ../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 "Error añadiendo el servicio. %s"
 
-#: ../src/config.py:150 ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Activo"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Evento"
-
-#: ../src/config.py:402
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Mensajes por defecto"
 
-#: ../src/config.py:409
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/config.py:451
-msgid "Always use OS/X default applications"
-msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
-
-#: ../src/config.py:452
-msgid "Custom"
-msgstr "Personalizado"
-
-#: ../src/config.py:645 ../src/dialogs.py:1199
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:646
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5806,110 +5976,74 @@ msgstr ""
 "Tienes que instalar el diccionario %s para usar el corrector, o elegir otro "
 "lenguaje definiendo la opción speller_language."
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Primer mensaje recibido"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Primer mensaje recibido focalizado"
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Primer mensaje recibido desfocalizado"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Nombre de contacto"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Contacto desconectado"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Mensaje enviado"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Resaltado de mensaje de grupo de charla"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Mensaje de grupo de charla recibido"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "Correo de GMail recibido"
-
 #. Name column
-#: ../src/config.py:1373 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
-#: ../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 "Nombre"
 
-#: ../src/config.py:1459
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "¿Reconectar ahora?"
 
-#: ../src/config.py:1460
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si quieres que se apliquen todos los cambios instantáneamente, debes "
 "reconectar."
 
-#: ../src/config.py:1585 ../src/config.py:1684
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1720 ../src/config.py:1763
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Eventos sin leer"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Todas las conversaciones y grupos de charla serán cerrados. ¿Deseas "
 "continuar?"
 
-#: ../src/config.py:1759
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1760
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1764
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar el nombre de la cuenta, debes leer el resto de\n"
 " eventos pendientes"
 
-#: ../src/config.py:1770
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5917,141 +6051,141 @@ msgstr ""
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
 
-#: ../src/config.py:1775 ../src/config.py:1779
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1776
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1780
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1854
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Renombrar cuenta"
 
-#: ../src/config.py:1855
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduce un nuevo nombre para la cuenta %s"
 
-#: ../src/config.py:1882
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Una ID de Jabber debe estar en la forma \"usuario@nombreservidor\"."
 
-#: ../src/config.py:2072 ../src/config.py:3211
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:2073 ../src/config.py:3212
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:2130
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:2131
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:2138
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Debes crear una cuenta antes de editar tu información personal"
 
-#: ../src/config.py:2146 ../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 "No estás conectado al servidor"
 
-#: ../src/config.py:2147
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sin una conexión, no puedes editar tu información personal"
 
-#: ../src/config.py:2151
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:2152
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:2183
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2184
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, renómbralo o elimínalo antes de habilitar la mensajería de enlace "
 "local."
 
-#: ../src/config.py:2367
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2369
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the beginning
-#: ../src/config.py:2405
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2406
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2457 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr ""
 
-#: ../src/config.py:2465
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2501
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6059,11 +6193,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2503
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2504
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6071,11 +6205,11 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2506
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2507
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6083,11 +6217,11 @@ msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6095,14 +6229,15 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2511
+#: ../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 ""
 "Puede ser uno de los siguientes:\n"
 "1. usuario@dominio/recurso (sólo ese recurso coincide)2. usuario@dominio "
@@ -6111,86 +6246,91 @@ msgstr ""
 "usuario@dominio, dominio/recurso o dirección conteniendo\n"
 "un subdominio."
 
-#: ../src/config.py:2608
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2630 ../src/gajim.py:1429 ../src/roster_window.py:1932
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2631 ../src/roster_window.py:1906
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2632 ../src/roster_window.py:1933
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2641
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Si la eliminas, se perderá la conexión con el servidor"
 
-#: ../src/config.py:2738
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2738
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2739
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:2740
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:2808
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2842
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrate de rellenar los campos de servidor y salón o elimina "
 "este marcador."
 
-#: ../src/config.py:3122
-msgid "Invalid username"
-msgstr "Nombre de usuario no válido"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Alias no válido"
 
-#: ../src/config.py:3124
-msgid "You must provide a username to configure this account."
-msgstr "Debes proporcionar un nombre para configurar esta cuenta."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Alias no permitido: %s"
 
-#: ../src/config.py:3150
-msgid "Duplicate Jabber ID"
-msgstr "ID de Jabber duplicada"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Servidor no válido"
 
-#: ../src/config.py:3151
-msgid "This account is already configured in Gajim."
-msgstr "Esta cuenta ya está configurada en Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Entrada no válida"
 
-#: ../src/config.py:3168
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3169 ../src/config.py:3358
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6200,24 +6340,32 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3187
-msgid "Invalid server"
-msgstr "Servidor no válido"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Tu nueva cuenta ha sido creada con éxito"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3188
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Debes proporcionar un nombre para configurar esta cuenta."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifica un servidor donde te quieras registrar."
 
-#: ../src/config.py:3239 ../src/gajim.py:2007
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: ../src/config.py:3240 ../src/gajim.py:2008
+#: ../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 "Este certificado ya está en el archivo %s, no fue añadido de nuevo."
 
-#: ../src/config.py:3308
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6232,7 +6380,7 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: ../src/config.py:3314 ../src/gajim.py:2031
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6243,14 +6391,10 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: ../src/config.py:3337 ../src/config.py:3376
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3357
-msgid "Your new account has been created successfully"
-msgstr "Tu nueva cuenta ha sido creada con éxito"
-
 #: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
@@ -6259,7 +6403,51 @@ msgstr "El nombre de la cuenta está en uso"
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Activo"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Evento"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Primer mensaje recibido"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Primer mensaje recibido focalizado"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Primer mensaje recibido desfocalizado"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Nombre de contacto"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Contacto desconectado"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Mensaje enviado"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Resaltado de mensaje de grupo de charla"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Mensaje de grupo de charla recibido"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Correo de GMail recibido"
+
+#: ../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"
@@ -6269,7 +6457,7 @@ msgstr ""
 "recibido por el extremo remoto. Si este icono permanece\n"
 "mucho tiempo, probablemente el mensaje se haya perdido."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6277,74 +6465,74 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: ../src/conversation_textview.py:691
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Salir"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:703
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:708
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:738
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/conversation_textview.py:741
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
-#: ../src/conversation_textview.py:1014 ../src/conversation_textview.py:1032
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Error ejecutando \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1289
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1293
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "La ID de Jabber ya está en la lista"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "La ID de Jabber que introdujiste ya está en la lista. Elige otra."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "nuevo@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nuevo%d@jabber.id"
@@ -6359,145 +6547,145 @@ msgstr "Nombre del contacto : <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Definir estado de ánimo"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "¿Sobreescribir mensaje de estado?"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Este nombre ya se usa. ¿Quieres sobreescribir este mensaje de estado?."
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Guardar como mensaje de estado predefinido"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Escribe un nombre para este mensaje de estado"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Dirección AIM:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Número GG:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Número ICQ:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Dirección MSN:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Dirección Yahoo!:"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último pero no menos importante, queremos agradecer a todos los "
 "mantenedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6510,89 +6698,89 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "El alias tiene caracteres no permitidos."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Petición de adición para la cuenta %(account)s de %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2632
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "No puedes entrar a un salón de chat hasta que no estés conectado."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1454
-#: ../src/groupchat_control.py:1735
-msgid "The nickname has not allowed characters."
-msgstr "El alias tiene caracteres no permitidos."
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1903
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s no es el nombre de un grupo de charla."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "No puedes sincronizar con una cuenta hasta que no te hayas conectado."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../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:"
@@ -6601,274 +6789,298 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2494
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2495
-#: ../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 "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
 #. 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 "Contacto conectado"
 
-#: ../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 "Contacto desconectado"
 
 #. 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 "Nuevo mensaje"
 
 #. 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 "Nuevo mensaje"
 
 #. 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 "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1594 ../src/notify.py:486
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1660 ../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 "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1560 ../src/gajim.py:1627
-#: ../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 "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1702 ../src/gajim.py:1724
-#: ../src/gajim.py:1741 ../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 "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1705 ../src/notify.py:484
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1450 ../src/notify.py:488
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:490
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2395 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2396 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:2440
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:2566
+#. 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 "Me gustaría añadirte a mi lista de contactos."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Dirección"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Malhumorado"
+
+#: ../src/dialogs.py:2812
+msgid "Jabber ID"
+msgstr "ID de Jabber:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupo"
+
+#. 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 "Me gustaría añadirte a mi lista de contactos"
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:2626
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orden: %(order)s, acción: %(action)s, tipo: %(type)s, valor: %(value)s"
 
-#: ../src/dialogs.py:2631
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: ../src/dialogs.py:2673
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:2760
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:2928
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Debes introducir un nombre para crear una una lista de privacidad."
 
-#: ../src/dialogs.py:2961
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: ../src/dialogs.py:2964
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact te ha invitado al grupo de charla %(room_jid)s"
 
-#: ../src/dialogs.py:2974
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: ../src/dialogs.py:3031
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:3041 ../src/dialogs.py:3092
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:3079
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:3097
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:3162
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3239
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:3357
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "cuando esté "
 
-#: ../src/dialogs.py:3829
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6879,19 +7091,19 @@ msgstr ""
 "\n"
 "La cadena corta de autentificación de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3833
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Ya verificaste la identidad de este contacto."
 
-#: ../src/dialogs.py:3839 ../src/dialogs.py:3926
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Identidad del contacto verificada"
 
-#: ../src/dialogs.py:3847
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verificar de nuevo..."
 
-#: ../src/dialogs.py:3852
+#: ../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 "
@@ -6901,19 +7113,19 @@ msgstr ""
 "persona esperada, necesitas verificar su identidad haciendo click en el "
 "botón inferior."
 
-#: ../src/dialogs.py:3855 ../src/dialogs.py:3907 ../src/dialogs.py:3920
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "La identidad del contacto NO fue verificada"
 
-#: ../src/dialogs.py:3862
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "¿Has verificado la identidad del contacto?"
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6928,22 +7140,22 @@ msgstr ""
 "\n"
 "La Cadena Corta de Autentificación (CCA) de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3876
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "¿Se lo dijiste a tu contacto remoto y verificaste el CCA?"
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "La clave del contacto (%s) <b>no coincide</b> con la clave asignada en Gajim."
 
-#: ../src/dialogs.py:3914
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
 
-#: ../src/dialogs.py:3921
+#: ../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."
@@ -6952,7 +7164,7 @@ msgstr ""
 "de modo que <b>no</b> será cifrado. Usa tu cliente GPG para otorgar "
 "confianza a esta clave."
 
-#: ../src/dialogs.py:3927
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -6960,33 +7172,33 @@ msgstr ""
 "La clave GPG se asignó a este contacto, y confías en esta clave, de modo que "
 "los mensajes serán cifrados."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6994,219 +7206,241 @@ msgstr ""
 "No hay servicio en la dirección introducida, o no está respondiendo. "
 "Comprueba la dirección e inténtalo de nuevo."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servicio no contiene ningún elemento a navegar."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Ejecutar comando"
 
-#: ../src/disco.py:1190 ../src/disco.py:1354
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Marcador ya definido"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Marcador añadido con éxito"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Error del certificado SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Una librería usada para validar certificados de servidor para asegurar "
 "conexiones seguras."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Requiere python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Charla sin servidor con clientes autodetectados en una red local."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Requiere python-avahi."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requiere pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Comandos: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Un script para controlar Gajim vía línea de comandos."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Requiere python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88
+#: ../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 "Característica no disponible en Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Encriptación OpenPGP"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Cifrado de conversaciones con claves gpg"
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requiere gpg y python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
-msgstr ""
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
+msgstr "Histórico"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Autodetección del estado de la red."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requiere gnome-network-manager y python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Gestión de sesiones"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "La sesión de Gajim se guarda al desconectar y se restaura al conectar."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Requiere python-gnome2."
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Contraseña para entrar al salón"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Las contraseñas se pueden guardar de forma segura y no sólo en texto plano."
 
-#: ../src/features_window.py:75
-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 "Requiere gnome-keyring y python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Posibilidad de conectar a servidores que usen registros SRV"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Requiere dnsutils"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Requiere nslookup para usar los registros SRV."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Corrector ortográfico"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Corrección ortográfica de los mensjes compuestos."
 
-#: ../src/features_window.py:83
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Requiere python-gnome2-extras o la compilación del módulo gtkspell de las "
-"fuentes de Gajim."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Requiere python-sexy"
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Demonio notificador"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Notificaciones"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Mensajes emergentes pasivas para nuevos eventos."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7214,52 +7448,53 @@ msgstr ""
 "Requiere python-notify o python-dbus en conjunción con notification-daemon "
 "en su lugar-"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Icono del área de notificación"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Un icono en el área de notificación reflejando la presencia actual."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Requiere python-gnome2-extras o el módulo trayicon compilado de las fuentes "
 "de Gajim."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Requiere PyGTK >= 2.10."
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Inactivo"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Ajustar al estado"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Posibilidad de medir el tiempo de inactividad para definir el auto-estado."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Requiere python-gnome2."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformar expresiones LaTeX entre $$ $$."
 
-#: ../src/features_window.py:99
+#: ../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."
@@ -7267,7 +7502,7 @@ msgstr ""
 "Requiere texlive-latex-base y dvipng. Tienes que definir 'use_latex' a True "
 "en el Editor de Configuración Avanzada."
 
-#: ../src/features_window.py:100
+#: ../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."
@@ -7275,23 +7510,25 @@ msgstr ""
 "Requiere textlive-latex-base y dvipng (Todo está en MikTeX). Tienes que "
 "definir 'use_latex' a True en el Editor de Configuración Avanzada."
 
-#: ../src/features_window.py:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Cifrado End to End"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Cifrando conversaciones."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Requiere python-crypto"
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Generador RST"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7299,23 +7536,23 @@ msgstr ""
 "Generar salida XHTML partiendo de un código RST (mira http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Requiere python-docutils"
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Posibilidad de hacer URLs clickables en las ventanas de charla"
 
-#: ../src/features_window.py:111 ../src/features_window.py:112
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Requiere python-sexy"
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Característica"
 
@@ -7344,7 +7581,7 @@ msgstr "Tamaño: %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:496
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Tú"
 
@@ -7354,7 +7591,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Recipiente: "
 
@@ -7386,26 +7623,27 @@ msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Transferencia de archivo detenida por el contacto de la otra parte"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Transferencia del archivo detenida"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Descripción: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
@@ -7425,12 +7663,12 @@ msgstr "Descripción: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../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 "No se puede sobreescribir el archivo existente \"%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."
@@ -7438,22 +7676,22 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: ../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 "Este archivo ya existe"
 
-#: ../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 "¿Qué quieres hacer?"
 
 #. 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 "No se puede escribir en el directorio \"%s\""
 
-#: ../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 "No tienes permisos para crear archivos en este directorio."
 
@@ -7489,11 +7727,11 @@ msgstr "Archivo: "
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Remitente: "
 
@@ -7501,36 +7739,40 @@ msgstr "Remitente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:93
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s no es un nivel de registro válido"
-
-#: ../src/gajim.py:165
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita el servidor X para para funcionar. Abortando..."
 
-#: ../src/gajim.py:194
-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 necesita PyGTK 2.8 o superior"
 
-#: ../src/gajim.py:195
-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 necesita PyGTK 2.8 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:197
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim necesita GTK 2.8 o superior"
 
-#: ../src/gajim.py:198
-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 necesita GTK 2.8 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:205
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7539,22 +7781,22 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
 "estable desde %s"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor, asegúrate de que GTK+ y PyGTK tienen soporte libglade en tu "
 "sistema."
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necesita pywin32 para funcionar"
 
-#: ../src/gajim.py:221
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7564,11 +7806,11 @@ msgstr ""
 "obtenerlo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim ya se encuentra en ejecución"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7576,26 +7818,36 @@ msgstr ""
 "Otra instancia de Gajim parece estar ya en ejecución\n"
 "¿Ejecutar otra?"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/gajim.py:501
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Ninguna clave GPG asignada"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Te conectarás a %s sin OpenPGP"
+
 #. ask again
-#: ../src/gajim.py:516
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: ../src/gajim.py:517
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
 
-#: ../src/gajim.py:564
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7606,50 +7858,59 @@ msgstr ""
 "ocupante.\n"
 "Especifica otro alias abajo:"
 
-#: ../src/gajim.py:578
+#: ../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 "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: ../src/gajim.py:583
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:631 ../src/notify.py:492 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../src/gajim.py:934 ../src/gajim.py:938
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Error %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:948 ../src/gajim.py:962
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:994
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Petición de adición"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:1015
+#: ../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?"
@@ -7657,72 +7918,77 @@ msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: ../src/gajim.py:1056
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Eliminar"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:1232 ../src/groupchat_control.py:1165
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s ahora es conocido como %(new_nick)s"
 
-#: ../src/gajim.py:1250 ../src/groupchat_control.py:1340
-#: ../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 está ahora %(status)s"
 
-#: ../src/gajim.py:1313
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ha cambiado el asunto a %(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:1377 ../src/groupchat_control.py:1125
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "el salón ahora no muestra miembros no disponibles"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Ha ocurrido un cambio en el salón no relacionado con la privacidad"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Ha sido activado el registro del salón"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "El salón está ahora deshabilitado"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "El salón es ahora no-anónimo"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
-#: ../src/gajim.py:1430
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Se requiere una contraseña para entrar al salón %s. Introdúcela."
 
-#: ../src/gajim.py:1464
+#: ../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"
@@ -7730,27 +7996,56 @@ msgstr ""
 "Configuraste Gajim para usar un agente GPG, pero no hay ningún agente en "
 "ejecución o el mismo devolvió una contraseña errónea.\n"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:1571
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG no es usable"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
+
+#: ../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 "_No preguntarme otra vez"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring está instalado pero no fue \t\t\t\t\t\t\tiniciado "
+"correctamente (la variable de entorno probablemente no fue \t\t\t\t\t\t"
+"\tcorrectamente definida)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Correo nuevo en %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Tienes %d nueva conversación de correo"
 msgstr[1] "Tienes %d nuevas conversaciones de correo"
 
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7765,34 +8060,44 @@ msgstr ""
 "Asunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1657
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina contacto del roster"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Error leyendo el archivo:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Has recibido con éxito el archivo %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Has enviado con éxito el archivo %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1746
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7801,36 +8106,36 @@ msgstr ""
 "No se puede descifrar el mensaje de %s\n"
 "Es posible que haya sido manipulado."
 
-#: ../src/gajim.py:1841
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "No se puede descifrar el mensaje"
 
-#: ../src/gajim.py:1912
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: ../src/gajim.py:1913
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escribe un nuevo nombre de usuario para tu cuenta local"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1949
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gajim.py:1974
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: ../src/gajim.py:1975
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7838,11 +8143,11 @@ msgstr ""
 "Ya estás conectado a esta cuenta con el mismo recurso. Por favor escribe uno "
 "nuevo"
 
-#: ../src/gajim.py:2028
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: ../src/gajim.py:2029
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7853,19 +8158,19 @@ msgstr ""
 "(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Error del certificado SSL"
 
-#: ../src/gajim.py:2050
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7878,11 +8183,11 @@ msgstr ""
 "\n"
 "¿Aún quieres conectar y actualizar la huella del certificado?"
 
-#: ../src/gajim.py:2072 ../src/gajim.py:2102
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Conexión no segura"
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7890,16 +8195,11 @@ msgstr ""
 "Vas a enviar tu contraseña en una conexión no cifrada- ¿Estás seguro de "
 "querer hacer esto?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sí, quiero conectarme de forma no segura"
 
-#: ../src/gajim.py:2076 ../src/gajim.py:2106 ../src/groupchat_control.py:1844
-#: ../src/roster_window.py:3769
-msgid "Do _not ask me again"
-msgstr "_No preguntarme otra vez"
-
-#: ../src/gajim.py:2103
+#: ../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?"
@@ -7907,21 +8207,21 @@ msgstr ""
 "Vas a enviar tu contraseña a través de una conexión no segura. Deberías "
 "instalar PyOpenSSL para prevenirlo. ¿Estás seguro de que quieres hacerlo?"
 
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "El nodo PEP no fue eliminado"
 
-#: ../src/gajim.py:2121
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2589 ../src/gajim.py:2611
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/gajim.py:2590
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7929,7 +8229,7 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: ../src/gajim.py:2612
+#: ../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 "
@@ -7939,55 +8239,38 @@ msgstr ""
 "actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
 "wiki/Emoticons para más detalles."
 
-#: ../src/gajim.py:2638 ../src/roster_window.py:3303
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "No puedes entrar a un grupo de charla estando invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2917
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:3014
-msgid "Bookmark already set"
-msgstr "Marcador ya definido"
-
-#: ../src/gajim.py:3015
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
-
-#: ../src/gajim.py:3028
-msgid "Bookmark has been added successfully"
-msgstr "Marcador añadido con éxito"
-
-#: ../src/gajim.py:3029
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Muestra ayuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostrar ayuda sobre un comando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Muestra u oculta la ventana de la lista de contactos"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Levanta una venana con el siguiente evento pendiente"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7995,49 +8278,50 @@ msgstr ""
 "Muestra una lista de todos los contactos en el roster. Cada contacto aparece "
 "en una línea separada"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "cuenta"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostrar sólo contactos de la cuenta especificada"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Muestra una lista de cuentas registradas"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Cambia el estado de una o varias cuentas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "mensaje"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "ensaje de estado"
 
-#: ../src/gajim-remote.py:113
+#: ../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 +8330,23 @@ msgstr ""
 "cambiar el estado de todas las cuentas que tienen la opción \"sync with "
 "global status\" activada"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Muestra el diálogo de conversación para enviar mensajes a un contacto"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contacto con el que quieres conversar"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "si es especificado, el contacto es obtenido de la lista de esta cuenta"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8068,29 +8356,29 @@ msgstr ""
 "clave OpenPGP como la cuenta son opcionales. Si quieres definir sólo "
 "'cuenta' sin 'clave pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "la JID del contacto que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "contenido del mensaje"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "clave pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "si es especificado, el mensaje será cifrado usando su clave pública"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "si es especificado el mensaje será enviado a través de esta cuenta"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8100,138 +8388,138 @@ msgstr ""
 "como la cuenta son opcionales. Si quieres definir sólo 'cuenta' sin 'clave "
 "pgp', sólo define 'clave pgp' a ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "tema del mensaje"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envía un nuevo mensaje a un grupo de charla al que hayas entrado"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "La JID del salón que recibirá el mensaje"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Obtener información detallada de un contacto"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID del contacto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Obtener información detallada de una cuenta"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Nombre de la cuenta"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "archivo"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "si es especificado el archivo será enviado usando esta cuenta"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lista todas las preferencias y sus valores"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define el valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'entrada' es el nombre de la preferencia, 'valor' es el valor a definir"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nombre de la preferencia a eliminar"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe el estado actual de la preferencias de Gajim al archivo de "
 "configuración"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Elimina contacto del roster"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Añade contacto al roster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Añade nuevo contacto a esta cuenta."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devuelve el estado actual (el global si no se especifica una cuenta)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devuelve el mensaje de estado actual (el global si no se especifica una "
 "cuenta)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Devuelve el número de mensajes sin leer"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre el diálogo de iniciar conversación"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversación usando esta cuenta"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML a enviar"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8239,67 +8527,72 @@ msgstr ""
 "Cuenta a la que el xml será enviado; si no se especifica nada, el xml será "
 "enviado a todas las cuentas"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Manejar una uri xmpp:/"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI a manejar"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "La cuenta que quieres manejar"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "contenido del mensaje"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Entrar en un salón MUC"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "salón"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID del salón"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "alias"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Alias a usar"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "contraseña"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Contraseña para entrar al salón"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "La cuenta desde la que quieres entrar al salón"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Comprueba si Gajim se encuentra en ejecución"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Muestra u oculta la ventana ipython"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8308,15 +8601,15 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Parece que Gajim no está en ejecución. No puedes usar gajim-remote."
 
-#: ../src/gajim-remote.py:403
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8325,16 +8618,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:407
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8343,7 +8636,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:480
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8352,7 +8645,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:485
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8361,7 +8654,7 @@ msgstr ""
 "No se especificó el argumento \"%(arg)s\". \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:504
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Uri incorrecta"
 
@@ -8378,15 +8671,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Por favor crea un nuevo tema desde cero con el nombre deseado."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nombre del tema"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "No puedes eliminar el tema actual"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
@@ -8401,152 +8694,156 @@ msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ya no estás en el grupo de charla \"%(room)s\" o \"%(nick)s\" se ha ido."
 
-#: ../src/groupchat_control.py:453
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: ../src/groupchat_control.py:607
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
-#: ../src/groupchat_control.py:1028
-msgid "Really send file?"
-msgstr "¿Enviar fichero?"
-
-#: ../src/groupchat_control.py:1029
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Si envías un archivo a %s, el/ella sabrá tu ID de Jabber real."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1128
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: ../src/groupchat_control.py:1133
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "El servidor ha asignado o modificado tu alias en el salón"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1139
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1150
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1163
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:1201 ../src/groupchat_control.py:1205
-#: ../src/groupchat_control.py:1210
+#: ../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 ha sido eliminado del salón (%(reason)s)"
 
-#: ../src/groupchat_control.py:1202
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: ../src/groupchat_control.py:1207
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: ../src/groupchat_control.py:1212
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: ../src/groupchat_control.py:1281
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** La afiliación de %(nick)s ha sido definida en &(affiliation)s por %(actor)"
 "s"
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** La afiliación de %(nick)s ha sido definida en %(affiliation)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** El rol de %(nick)s ha sido fijado a %(role)s"
 
-#: ../src/groupchat_control.py:1333
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:1338
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1453 ../src/groupchat_control.py:1734
-msgid "Invalid nickname"
-msgstr "Alias no válido"
-
-#: ../src/groupchat_control.py:1477 ../src/groupchat_control.py:1495
-#: ../src/groupchat_control.py:1579 ../src/groupchat_control.py:1596
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_control.py:1511
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Este grupo de charla no tiene tema"
 
-#: ../src/groupchat_control.py:1522
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s invitado a %(room_jid)s."
 
-#: ../src/groupchat_control.py:1657
+#: ../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 "Alias no encontrado: %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 ""
 "Uso: /%s <alias|JID> [motivo], expulsa el JID del grupo de charla. El alias "
 "de un ocupante puede ser sustituido, pero no si contiene \"@\". Si el JID "
 "está actualmente en el grupo de conversación, el/ella será también "
 "expulsado. NO soporta espacio en el alias."
 
-#: ../src/groupchat_control.py:1664
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8555,7 +8852,7 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8564,7 +8861,7 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_control.py:1676
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8573,7 +8870,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al grupo de charla actual, "
 "opcionalmente proveyendo un motivo."
 
-#: ../src/groupchat_control.py:1680
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8582,17 +8879,16 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_control.py:1684
-#, 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 ""
 "Uso: /%s <alias> [motivo], elimina del salón al ocupante especificado por el "
 "alias y opcionalmente muestra un motivo. NO soporta espacios en el alias."
 
-#: ../src/groupchat_control.py:1693
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8601,60 +8897,74 @@ msgstr ""
 "Uso: /%s <alias> [mensaje], abre una ventana de conversación y envía mensaje "
 "al ocupante especificado por el alias."
 
-#: ../src/groupchat_control.py:1698
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alias>, cambia tu alias en el salón actual."
 
-#: ../src/groupchat_control.py:1702
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s , muestra los nombres de los ocupantes del grupo de charla."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tema], muestra o actualiza el tema actual del salón."
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaje>, envía un mensaje sin buscar otros comandos."
 
-#: ../src/groupchat_control.py:1838
+#: ../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 "Uso: /%s <alias>, cambia tu alias en el salón actual."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "¿Estás seguro de querer abandonar el salón \"%s\"?"
 
-#: ../src/groupchat_control.py:1840
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si cierras esta ventana, serás desconectado de este grupo de charla."
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1878
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: ../src/groupchat_control.py:1910
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8662,22 +8972,22 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: ../src/groupchat_control.py:1912
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2376
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2375
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -8708,78 +9018,78 @@ msgstr "Detalles"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Error analizando el archivo:"
 
 #. 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 ""
 "No se puede escribir en %s. El soporte de manejo de sesión no funcionará"
 
 #. 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 no es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "¿Quieres hacer de Gajim el cliente por defecto de 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 ""
 "Comprobar siempre al inicio si Gajim es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: ../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 ""
 "La imagen no se pudo guardar en formato %(type)s. ¿Guardar como %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "No se puede encontrar la base de datos del historial"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contactos"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Fecha"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Alias"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8787,7 +9097,7 @@ msgstr ""
 "¿Quieres limpiar la base de datos? (TOTALMENTE DESACONSEJADO SI GAJIM ESTÁ "
 "EN EJECUCIÓN)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8801,27 +9111,27 @@ msgstr ""
 "\n"
 "En caso de elegir SI, por favor, espera..."
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exportando historial..."
 
-#: ../src/history_manager.py:509
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dijo: %(message)s\n"
 
-#: ../src/history_manager.py:546
+#: ../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] "¿Realmente quieres eliminar el historial del contacto seleccionado?"
 msgstr[1] ""
 "¿Realmente quieres eliminar el historial de los contactos seleccionados?"
 
-#: ../src/history_manager.py:550 ../src/history_manager.py:585
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Esta es una operación irreversible"
 
-#: ../src/history_manager.py:582
+#: ../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] "¿Realmente quieres eliminar el mensaje seleccionado?"
@@ -8851,27 +9161,37 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: ../src/message_window.py:433
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "No estás conectado al servidor"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "¿Realmente quieres eliminar el mensaje seleccionado?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:435
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:437
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -8883,66 +9203,67 @@ msgstr "- los mensajes serán registrados"
 msgid "- messages will not be logged"
 msgstr "- los mensajes no serán registrados"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuevo mensaje privado desde el grupo de charla %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 "Enviado por %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Genérico"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignorar"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2768
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2771
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2773 ../src/roster_window.py:2784
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
@@ -8974,55 +9295,46 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/roster_window.py:286 ../src/roster_window.py:940
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1909
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring está instalado pero no fue \t\t\t\t\t\t\tiniciado "
-"correctamente (la variable de entorno probablemente no fue \t\t\t\t\t\t"
-"\tcorrectamente definida)"
-
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG no es usable"
 
-#: ../src/roster_window.py:2103 ../src/roster_window.py:3247
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: ../src/roster_window.py:2104 ../src/roster_window.py:3248
+#: ../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?"
@@ -9030,15 +9342,28 @@ msgstr ""
 "Cambiando tu estado a invisible provocará tu desconexión de los grupos de "
 "charla. ¿Estás seguro de querer ser invisible?"
 
-#: ../src/roster_window.py:2130
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505
+#: ../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 "¿Estás seguro de querer abandonar los salones \"%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 "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2269
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9046,27 +9371,27 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado y el contacto está en tu roster."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 "Ya no podrás enviar y recibir mensajes de contactos que usen este transporte"
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9075,51 +9400,56 @@ msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2649
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:2650
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "¿Quieres eliminar el grupo %s del roster?"
 
-#: ../src/roster_window.py:2716
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar del roster también a todos los contactos dentro del grupo"
 
-#: ../src/roster_window.py:2755
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:3108
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9128,11 +9458,11 @@ msgstr ""
 "resultante y el/ella siempre te verán desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3117
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: ../src/roster_window.py:3121
+#: ../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."
@@ -9140,16 +9470,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9159,19 +9489,19 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debes crear una cuenta antes de poder conversar con otros contactos."
 
-#: ../src/roster_window.py:3687
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:3689
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9179,12 +9509,12 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: ../src/roster_window.py:3763
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vas a crear un metacontacto. ¿Estás seguro de continuar?"
 
-#: ../src/roster_window.py:3765
+#: ../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 "
@@ -9194,139 +9524,141 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:3878
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: ../src/roster_window.py:3889
+#: ../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] "Quieres enviar este archivo a %s:"
 msgstr[1] "Quieres enviar estos archivos a %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Hacer %s y %s metacontactos"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4566 ../src/roster_window.py:4637
-#: ../src/roster_window.py:4646 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "usando la cuenta %s"
 
 #. add
-#: ../src/roster_window.py:4653
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:4695 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:4755
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:4817 ../src/roster_window.py:4926
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:4844
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:4851
-msgid "Mood"
-msgstr "Estado de ánimo"
-
-#: ../src/roster_window.py:4855
-msgid "Activity"
-msgstr "Actividad"
-
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Configurar servicios..."
 
-#: ../src/roster_window.py:5014
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
 #. Send Group Message
-#: ../src/roster_window.py:5022 ../src/roster_window.py:5548
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: ../src/roster_window.py:5030
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
 #. Send single message
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5693
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nuevo grupo de charla"
 
 #. History manager
-#: ../src/roster_window.py:5967
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Histórico"
 
-#: ../src/roster_window.py:5976
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
@@ -9347,16 +9679,16 @@ msgstr "Sin resultados"
 msgid "Disk WriteError"
 msgstr "Error de escritura en disco"
 
-#: ../src/session.py:237
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:397 ../src/session.py:432
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Confirma estas opciones de la sesión"
 
-#: ../src/session.py:399
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9371,7 +9703,7 @@ msgstr ""
 "\n"
 "\t¿Son aceptables estas opciones?"
 
-#: ../src/session.py:433
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9386,124 +9718,116 @@ msgstr ""
 "\n"
 "¿Continuar con la sesión?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../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 de este grupo de conversación"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Estado de ánimo:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Actividad:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Música:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servicio no ha respondido todavía con información detallada"
 
-#: ../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"
@@ -9519,16 +9843,21 @@ msgstr "Desconocido"
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Desconocido"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliación:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9536,7 +9865,7 @@ msgstr ""
 "Este contacto está interesado en la información de tu presencia, pero tú no "
 "lo estás en la suya"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9544,14 +9873,14 @@ msgstr ""
 "Estás interesado en la información de la presencia del contacto, pero él/"
 "ella no lo está en la tuya"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9559,19 +9888,94 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Estás esperando la respuesta del contacto acerca de tu petición de adición"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "No hay ninguna suscripción pendiente."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
+#~ msgid "Your JID:"
+#~ msgstr "Tu JID"
+
+#, fuzzy
+#~ msgid "B_OSH Port:"
+#~ msgstr "_Puerto:"
+
+#~ msgid "Name:"
+#~ msgstr "Nombre:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Mostrar _roster"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Selecciona la cuenta con la que sincronizar"
+
+#~ msgid "Modify Account"
+#~ msgstr "Modificar cuenta"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s por %(artist)s\n"
+#~ "de %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Cuenta de Gajim %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizado"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "ID de Jabber duplicada"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Esta cuenta ya está configurada en Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Requiere python-gnome2-extras o la compilación del módulo gtkspell de las "
+#~ "fuentes de Gajim."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Demonio notificador"
+
+#~ msgid "Idle"
+#~ msgstr "Inactivo"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Transferencia de archivo detenida por el contacto de la otra parte"
+
+#~ msgid "Generic"
+#~ msgstr "Genérico"
+
+#~ msgid "Mood"
+#~ msgstr "Estado de ánimo"
+
+#~ msgid "Activity"
+#~ msgstr "Actividad"
+
 #~ msgid "_Host:"
 #~ msgstr "_Servidor"
 
@@ -9587,9 +9991,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Servers Features"
 #~ msgstr "Características de los servidores"
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Encriptación OpenPGP"
-
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s no ha difundido su clave OpenPGP ni tú le has asignado una"
 
@@ -9954,9 +10355,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Depositar %s en el grupo %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Hacer %s y %s metacontactos"
-
 #~ msgid "Affiliation:"
 #~ msgstr "Afiliación:"
 
@@ -10081,18 +10479,12 @@ msgstr " recurso con prioridad "
 #~ msgid "zh_CN"
 #~ msgstr "chino (China)"
 
-#~ msgid "Jabber ID"
-#~ msgstr "ID de Jabber:"
-
 #~ msgid "User ID"
 #~ msgstr "Identificador:"
 
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nombre de usuario no válido"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "vCard publicada con éxito"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Tu información personal ha sido publicada con éxito"
 
@@ -10104,9 +10496,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Since %s"
 #~ msgstr "Tamaño: %s"
 
-#~ msgid "Add"
-#~ msgstr "Dirección"
-
 #~ msgid "Away "
 #~ msgstr "Ausente"
 
@@ -10167,9 +10556,6 @@ msgstr " recurso con prioridad "
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s te ha enviado un nuevo mensaje"
 
-#~ msgid "GUI Migration failed"
-#~ msgstr "falló la publicación de la vCard"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "El registro ha sido migrado satisfactoriamente a la base de datos"
 
@@ -10228,9 +10614,6 @@ msgstr " recurso con prioridad "
 #~ msgid "account: "
 #~ msgstr "cuenta: "
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "¿Estás seguro de querer abandonar los salones \"%s\"?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "Si cierras esta ventana, serás desconectado de estos salones."
 
diff --git a/po/eu.po b/po/eu.po
index d3fb2e97d..94ebc0e86 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
+# Urtzi  <>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2006-12-09 17:38+0100\n"
-"Last-Translator: Urtzi \n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:50+0200\n"
+"Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgid "_Add Contact..."
 msgstr "_Kontaktua Gehitu..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
@@ -63,7 +64,7 @@ msgid "_Personal Events"
 msgstr "Informazio Pertsonala "
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "Elkarrizketa  _Hasi"
@@ -98,67 +99,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Erabili autentifikazioa"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Konektatu bukatu sakatzen dudanean."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu Sortzailearen Wizard-a"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Dagoeneko badut kontu bat erabiltzeko"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Moldatu..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Zerbitzariaren Ezaugarriak:"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Ezarri nire profila konektatzen naizenean"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
@@ -171,31 +170,32 @@ msgstr ""
 "Jabber sarera konektatzeko"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Zure JID-a:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "A_urreratua"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Hostname: "
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Portua:"
 
@@ -203,11 +203,6 @@ msgstr "_Portua:"
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Izena"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -216,18 +211,16 @@ msgstr "<b>Denetatik</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazio Pertsonala</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Kontua"
 
@@ -236,25 +229,24 @@ msgid "Account Modification"
 msgstr "Kontu Eraldaketa"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Administratzaile Zerrenda"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Konektatu berriro konexioa galtzean"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_onektatu Gajim irikitzean"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Al_datu Pasahitza"
 
@@ -271,37 +263,35 @@ msgstr ""
 "be disabled"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Aukeratu _Kodea...."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Sakatu kontuaren pasahitza aldatzeko"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Konektatu"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Informazio Pertsonala Editatu..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -309,17 +299,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Orokorra"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Hostname: "
 
@@ -343,7 +330,6 @@ msgstr ""
 "gerta ez dadin"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -353,7 +339,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -363,7 +348,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -379,43 +363,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Ezer ez"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazio Pertsonala "
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Portua: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Lehentas_una:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -426,7 +412,7 @@ msgstr ""
 "Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Lehentasuna automatikoki ezarriko da zure egoeraren arabera."
 
@@ -435,13 +421,13 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Baliabid_ea: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -456,30 +442,25 @@ msgstr ""
 "lehentasun handiena duenera bidaliko da. (Behean ikusi) "
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Gorde _pasa-esaldia(ez trinkoa)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -490,21 +471,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Erabili _SSL(Legacy)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Erabili proxy fitxero transferentzia"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "Egoerarekin b_at egin"
 
-#: ../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:13
 #, fuzzy
 msgid "_Name:"
 msgstr "_Izena "
@@ -514,31 +490,38 @@ msgstr "_Izena "
 msgid "<b>Proxy</b>"
 msgstr "<b>Ezaugarriak</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Egoerarekin b_at egin"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontuak"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Erabili autentifikazioa"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onektatu Gajim irikitzean"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Posta:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktibatu"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Lehen Izena:"
 
@@ -548,7 +531,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -559,56 +541,96 @@ msgstr ""
 "You might consider to change possible firewall settings."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Azken Izena:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Batu kontuak"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Bidali keep-alive paketeak"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Erabili bezeroaren hostname/portua"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Erabili ezarritako portua:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Informazio Pertsonala Editatu..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Aktibatu"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Hostname: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Moldatu..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Portua:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "Kontu_a:"
@@ -802,7 +824,7 @@ msgid "All statuses"
 msgstr "Egoera Guztiak"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Kanpoan"
 
@@ -819,7 +841,7 @@ msgid "Have "
 msgstr "daukadanean"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Ikusezin"
 
@@ -828,7 +850,7 @@ msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
@@ -950,7 +972,7 @@ msgstr "Azken Eraldaketa:"
 msgid "New entry received"
 msgstr "Ekintza berri bat jasoa"
 
-#: ../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 "Sarrera berri bat jaso duzu:"
 
@@ -998,11 +1020,21 @@ msgstr "Sartu pasahitz berria:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Egoera mezu berria ezarri</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Aktibatuta"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Gela:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Ezarritako egoerak:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Gorde Ezarritako Bezala...."
 
@@ -1065,11 +1097,11 @@ msgstr "_Zerrendara Sartu"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historiala"
 
@@ -1185,7 +1217,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup jakinarazte bat"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -1221,7 +1253,7 @@ msgstr ""
 "Kontaktu zerrenda\n"
 "Banner Elkarrizketa "
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Negrita"
 
@@ -1241,11 +1273,11 @@ msgstr "Gajim-en Gaien Kustomizatazailea"
 msgid "Gone"
 msgstr "Joanda"
 
-#: ../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 "Inaktiboa"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Etzana"
 
@@ -1296,7 +1328,7 @@ msgstr "Aldatu _Gaia"
 msgid "Configure _Room..."
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "_Talde Agendan Sartu Gela hau"
@@ -1331,23 +1363,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Bota"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Partaidea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Jabea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Bidali Mezu Pribatu bat"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Ahotsa"
 
@@ -1355,13 +1401,13 @@ msgstr "_Ahotsa"
 msgid "Create new post"
 msgstr "Mezu berria sortu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "-etik"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Gaia"
 
@@ -1385,7 +1431,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim Historialeko Log Administratzailea"
 
-#: ../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 "Ezabatu"
 
@@ -1410,7 +1457,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Bilatu Datu Basean"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Elkarrizketaren Historiala"
 
@@ -1431,7 +1478,7 @@ msgstr "Bilatu"
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
@@ -1459,8 +1506,8 @@ msgstr "Berriki:"
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Sartu"
 
@@ -1488,7 +1535,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Inprimatu egoera:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
@@ -1523,32 +1570,51 @@ msgstr "<b>Aldaketak</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "HTTP konektatuta"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Profila Moldatu"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Izena:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pasa_hitza:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Mota:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Erabili autentifikazioa"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Portua:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host-a"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Proxy erabili"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Erabili autentifikazioa"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Mota:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Izena"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1588,17 +1654,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Bidali"
 
@@ -1705,10 +1776,14 @@ msgstr ""
 "Ikusezin"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1723,20 +1798,20 @@ msgstr ""
 "Beti XFCE4-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Interfazeko kolorea eta letra konfiguratu"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1745,34 +1820,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1782,7 +1857,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1792,7 +1867,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1800,19 +1875,19 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1820,18 +1895,18 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1839,7 +1914,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1847,7 +1922,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1855,7 +1930,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1863,7 +1938,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1871,14 +1946,14 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1888,14 +1963,14 @@ msgstr ""
 "Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. "
 "Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1904,7 +1979,7 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1914,13 +1989,13 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1928,67 +2003,79 @@ msgstr ""
 "Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
 "edo animatura eraldatuko ditu"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "M_ezu leiho bat"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Kontu Eraldaketa"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazio Pertsonala "
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Iku_si gertaerak systray-ean"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1996,148 +2083,152 @@ msgstr ""
 "Mezu batzuk gehiegizko edukia izan dezakete(koloreak, tamaina...). Hautatua "
 "badago, Gajim-ek testua modu sinple batean erakutsiko du. "
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Berezko egoera _ikurra:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Stalled"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatikoki _Kanpoan ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonoak:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Sarrerako mezua:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Kanp_oan nagoeneko mezua:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Txat Taldean _Sartu"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Ez dago zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutu"
 
@@ -2185,7 +2276,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
@@ -2255,127 +2346,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Bezeroak</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Soinuak</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamentua:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Posta:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Helbide Gehigarria:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familia:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Bezeroak</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Web Pertsonala:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Ezarri Araua</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Bezeroak</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Izengoitia:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefono Zenbakia:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Baldintzak</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Posta Kodea:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Ezaugarriak</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Soinuak</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Aldaketak</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Aldaketak</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Soinuak</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "About"
 
@@ -2385,17 +2476,17 @@ msgstr "Sakatu abatarea ezartzeko"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Informazio Pertsonala "
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Lana"
 
@@ -2413,8 +2504,8 @@ msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Ezabatu"
 
@@ -2439,14 +2530,14 @@ msgstr "Editatu _Taldeak"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Komandoa Exekutatu..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
@@ -2457,7 +2548,7 @@ msgstr "_Ezabatu"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
@@ -2484,12 +2575,6 @@ msgstr "Elkarrizketa _Hasi"
 msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
@@ -2513,17 +2598,35 @@ msgstr "_Berrrizenpetu"
 msgid "_Subscription"
 msgstr "Har_pidetza"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "bederatzi"
 
+#: ../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 "Ezabatu"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2551,59 +2654,64 @@ msgid "Profile, A_vatar"
 msgstr "Profila, A_batarea"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Kontuak"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Aukerak"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "At_era"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Bidali _Mezu Bakarra..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Ikusi"
 
@@ -2622,12 +2730,12 @@ msgid "_Add contact"
 msgstr "Kontaktua _Sartu"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Bilatu"
 
@@ -2715,10 +2823,6 @@ msgstr "Harpidetza Eskaria"
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2744,10 +2848,6 @@ msgstr "Bidali _Mezu Bakarra"
 msgid "Show All Pending _Events"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Ikusi _Zerrenda"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "E_goera"
@@ -2767,55 +2867,60 @@ msgstr "<b>Ekintzak</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Aldaketak</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Baliabidea:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Aldaketak</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Deskribapena</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Azalpenak"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Gehiago"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Abatarea:"
@@ -2828,6 +2933,11 @@ msgstr "<b>Jabber Trafikoa</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Sarrera</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Aktibatu"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2856,13 +2966,13 @@ msgstr "Open_PGP kodea zehaztu"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
@@ -2886,30 +2996,26 @@ msgstr "Baliabidea:"
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Kontua E_raldatu"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2937,7 +3043,7 @@ msgstr "Taldean"
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr ""
 
@@ -2962,230 +3068,267 @@ msgstr "(Ezer ez)"
 msgid "Hidden"
 msgstr "Ikusezin"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Sarrera berri bat jaso duzu:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Ingelesa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgariera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Greziera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperantoa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Frantsesa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Kroaziera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Alemana"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norbegiera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polakoa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugesa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brasileko Portugesa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Rusiera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemaniera"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Eslovakoa"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "bederatzi"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Izengoitia"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Mota:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Kontaktuaren Informazioa"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Ez dago zerrendan"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" by %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
@@ -3193,33 +3336,33 @@ msgstr "Erabili autentifikazioa"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3228,66 +3371,66 @@ msgstr ""
 "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
 "gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Erabilera:/%s, ezkutatu txat-eko botoilak."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3295,192 +3438,204 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 orain badago"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "bederatzi"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ez nahasi."
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "Deskripzio errorea...."
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Txat Taldea Berria"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s gelan sartu da"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mezu irakurri gabe"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Erabili D-Bus eta Notification-Daemon jakinarazketak erakusteko"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Ordua minutuetan, zure egoera ez erabilgarri aldatu ondoren."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Enable link-local/zeroconf messaging"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Zuzentzaileak erabiltzen duen hizkuntza"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3490,7 +3645,7 @@ msgstr ""
 "'sometimes' - inprimatu ordua print_ichat_every_foo_minutes minutuko.\n"
 "'never' - inoiz ez inprimatu ordua."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:109
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3501,17 +3656,17 @@ msgstr ""
 "fuzzyclocks-ri eta 0 fuzzyclock ezintzeko. 1 ordu zehatzena da, 4 berriz, "
 "zehaztasun gutxienekoa."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:116
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3521,7 +3676,7 @@ msgstr ""
 "Uses ReStructured text markup for HTML, plus ascii formatting if selected. "
 "(If you want to use this, install docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3529,7 +3684,7 @@ msgstr ""
 "Izengoitiaren ondoren ezartzeko karakterea txat talde batean tab-a "
 "erabiltzen bada."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3537,38 +3692,38 @@ msgstr ""
 "Izengoitiaren ondoren jartzeko proposatzen den karakterea, txat taldean "
 "beste pertsona batek izengoiti berbera badu."
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "Zenbat lerro gogoarazteko lehengo elkarrizketatik leihoa irikitzean."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
 "azkenetik."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3576,11 +3731,11 @@ msgstr ""
 "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
 "ICQ Client default behaviour)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3589,11 +3744,11 @@ msgstr ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3605,14 +3760,14 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Bidali txat elkarrizketaren egoera. All, composing_only edo disabled izan "
 "daiteke. "
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3620,7 +3775,7 @@ msgstr ""
 "Txat elkarrizketen goera mezua ikusarazi txat leihoan. All, composing_only "
 "edo disabled izan daiteke. "
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3628,11 +3783,11 @@ msgstr ""
 "Ez denean ordua mezu bakoitzeko inprimatzen (print_time==sometimes), "
 "imprimatu x minuturo."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3640,7 +3795,7 @@ msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3648,7 +3803,13 @@ msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3657,33 +3818,27 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC estandarrak esaten du KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Jakin arazi gertaerak system trayicon-ean."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3691,17 +3846,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3709,13 +3864,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3723,7 +3878,7 @@ msgstr ""
 "Egia bada, Gajim-ek  ikono bat azalaraziko du leiho horretan irakurri gabeko "
 "mezuak adieraziz. Gaiaren arabera ikonoa animatua izan daiteke."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3731,11 +3886,11 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3743,7 +3898,7 @@ msgstr ""
 "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."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3751,7 +3906,7 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:222
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3766,30 +3921,30 @@ msgstr ""
 "inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko "
 "ditu bakarrik."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Kontaktuen atzealdeko kolorea momentuan deskonektatzen direnean."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Egia bada, mezuen berrezartzea tamaia txikian egingo dira eta ez "
 "ezarritakoan."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "ez erakutsi zerrenda sistemako zeregin barran."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3799,7 +3954,7 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3810,7 +3965,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3830,32 +3985,32 @@ msgstr ""
 "konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
 "behar da."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Gezurra bada, txat leihoan ez duzu abatererik ikusiko. "
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Egia bada, ateratzeko botoila sakatzean tab/leihoa itxiko da."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3863,28 +4018,28 @@ msgstr ""
 "Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
 "denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickame."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Txat taldeko izengoitietan erabiliko diren koloreen zerrenda"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3892,7 +4047,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -3903,69 +4058,81 @@ msgstr ""
 "lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
 "zerbitzariarengandik. "
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../src/common/config.py:260
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../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."
@@ -3973,60 +4140,68 @@ msgstr ""
 "Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
 "aukeran ezarriak daude."
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4034,119 +4209,125 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "dena edo espazio egoera banandua"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'bai', 'ez', edo 'biak'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 "'bai', 'ez' edo ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Libre."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Agur!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4154,148 +4335,178 @@ msgstr ""
 "Soinua bat entzun MUC-ak muc_highlight_words-eko hitz bat agertzean edota "
 "gela bateko mezu batek zure izengoitia duenean."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Host okerra"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "vCard argitarapena egina"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Konexioak huts egin du"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Jabber ID baliogabea"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Ezin da gela honetara sartu"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ez zaude kideen zerrendan."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4305,274 +4516,284 @@ msgstr ""
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "%s konektatu behar zara OpenPGP-rik gabe."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Baliogabeko izena"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "%s transporteak harpidetza baimenari errore batez erantzun dio: %s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Konexioak huts egin du"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "%s gordea"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Konexioak huts egin du"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Ez da posible hutsik dauden artxiboak bidaltzea"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4581,19 +4802,30 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Kontaktua"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Begiratzaileak"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transportea"
 
@@ -4603,11 +4835,11 @@ msgid "Not in roster"
 msgstr "Ez dago zerrendan"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim-en D-Bus gaitasun funtzioa ezin da erabili"
 
@@ -4639,1123 +4871,1120 @@ msgstr ""
 "Bus saioa ez dago erabilgarri.\n"
 "Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "Hamabi"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "bat"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "bi"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "hiru"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "lau"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "bost"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "sei"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "zazpi"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "zortzi"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "bederatzi"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "Hamar"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "hamaika"
 
+#. 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 "Hamabi"
+msgid "%(0)s o'clock"
+msgstr "%(0)s o'clock"
 
-#. 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
-#, fuzzy
-msgid "$0 o'clock"
-msgstr "$0 o'clock"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-#, fuzzy
-msgid "five past $0"
-msgstr "$0 eta bost"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s eta bost"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
-msgid "ten past $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
 msgstr "&0 eta hamar"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
-msgid "quarter past $0"
-msgstr "$0 eta laurden"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s eta laurden"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-#, fuzzy
-msgid "twenty past $0"
-msgstr "$0 eta hogei"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s eta hogei"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-#, fuzzy
-msgid "twenty five past $0"
-msgstr "$0 eta hogeita bost"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s eta hogeita bost"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "half past $0"
-msgstr "$0 eta erdiak"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s eta erdiak"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "twenty five to $1"
-msgstr "$1 hogeita bost gutxi "
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(1)s hogeita bost gutxi "
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "twenty to $1"
-msgstr "$1 hogei gutxi"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "%(1)s hogei gutxi"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "quarter to $1"
-msgstr "$1 laurden gutxi"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "%(1)s laurden gutxi"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "ten to $1"
-msgstr "$1 -tik hamarrera"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "%(1)s -tik hamarrera"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "five to $1"
-msgstr "$1 bost gutxi"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "%(1)s bost gutxi"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-#, fuzzy
-msgid "$1 o'clock"
-msgstr "$1 ordu batak"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s ordu batak"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Gaua"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Goizaldea"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Goiza"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Eguerdia"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Eguerdia"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Arratsaldea"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Arratsaldea"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Ilunabarra"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Aste hasiera"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Aste erdia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Aste bukaera"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s Gib"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Libre"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "mezu bat sortzen ari da..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s Gib"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "%s gajim kontua"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "%s kontukoa"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Etena"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Negrita"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "daukadanean"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Txat-ak"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Negrita"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Edukiak"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Osatua"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Edukiak"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Inaktiboa"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Ezabatu"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Ezindu"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Ezindu"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Ezindu"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Taldea"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Host-a"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "mezua"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Ikusezin"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "bat"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Host-a"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Alemaniera"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Eraldatu"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Deskonektatuta"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Taldea"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "hamaika"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Stalled"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Azken Eraldaketa:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Izengoitia"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Lotan"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Kalea:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Harpidetu"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Denbora"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "bederatzi"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host okerra"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Arratsaldea"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Sortzen"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Goiza"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "talde hontakoak"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Arratsaldea"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Botatzen %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Sartu"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Gaia Aldatu"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Botatzen %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Botatzen %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Arrazoia"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Arrazoia"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Lotan"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Jaten"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Telefonoan nago."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Tranferitzen"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Sortzen"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Sortzen"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Lanean"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Unable to bind to port %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -5765,18 +5994,13 @@ msgstr ""
 "bertan behera utziko da."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5785,16 +6009,16 @@ msgstr ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5803,32 +6027,32 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Mesedez begiratu Avahi  instalatuta dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Ezin izan da zerbitzu lokalak hasi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Ezin izan da \"%s\" -ren egoera aldatu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5836,63 +6060,51 @@ msgstr ""
 "Ez zaude konektatuta edo ikusezin zaude. Ezin izan da zure mezua bidali."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontaktua deskonektatua dago. Zure mezua ezin izan da bidali. "
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "Host-era konexioa ezin izan da ezarri. Denbora joan da."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Ezindu"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Aktibatuta"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Gertaera"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Berezko Egoera Mezuak"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Bezeroak</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5901,109 +6113,72 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Lehen Mezu Jasoa"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Jasotako Hurrengo Mezua"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Jasotako Hurrengo Mezua"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kontaktua Konektatuta"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kontaktua Deskonektatuta"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Mezua Bidaltzean"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Txat Taldeko Mezu Nabarmendua"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Txat Taldeko Mezua Jasotzean"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "GMail posta jasoa"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Izena"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Momentuan aldaturiko aukerak ezarri nahi badituzu, birkargatu beharko duzu."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Elkarrizketa guztiak itxiko dira. Jarraitu nahi al duzu?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Kontuko izena aldatzeko,  irakurri gabeko gertaera guztiak irakurri behar "
 "dituzu."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6011,147 +6186,142 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kontuak moldatu"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Jabber ID baliogabea"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Mesedez berridatzi edo ezabatu hori  link-local messaging martxan jarri "
 "baino lehen."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6159,11 +6329,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6171,11 +6341,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6184,11 +6354,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6196,14 +6366,15 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Hauetako bat izan daiteke:\n"
 "1. izena@zerbitzaria/lehentasuna (Lehentasun parekidea bakarrik).\n"
@@ -6212,86 +6383,93 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Mesedez ziurtatu ezazu zerbitzariaren eta gelaren informazioa betetzeaz edo "
 "talde agenda hau ezabatzeaz"
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Baimenik gabeko izengoitia: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Bikoiztutako Jabber ID "
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6299,27 +6477,34 @@ msgid ""
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Zure kontu berria egoki sortua izan da."
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6329,7 +6514,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6337,106 +6522,148 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Zure kontu berria egoki sortua izan da."
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktibatuta"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Gertaera"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Lehen Mezu Jasoa"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Jasotako Hurrengo Mezua"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Jasotako Hurrengo Mezua"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontaktua Konektatuta"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontaktua Deskonektatuta"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Mezua Bidaltzean"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Txat Taldeko Mezu Nabarmendua"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Txat Taldeko Mezua Jasotzean"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "GMail posta jasoa"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "At_era"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "IM Jabber Bezeroa"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6451,42 +6678,42 @@ msgstr "Kontaktuaren izena: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Taldea"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "Taldean"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "ID kodea"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Kontaturen izena"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Ezarri MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Egoera Mezua"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Egoera Mezua"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6494,106 +6721,106 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Aurrez Ezarritako Mezua Jarri"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Mesedez ezarri izen bat egoera mezu honetarako"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Hebidea:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG zenbakia:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ zanbakia:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Helbidea:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Helbide:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Mesedez ezarri sartu nahi duzun kontaktuaren informazioa %s kontuarako"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Azkenak baina ez gutxien merezitakoak,\n"
 "eskerrak eman nahi dzkiegu paketeak mantentzen dituztenei."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6604,93 +6831,93 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "ID Jabber gelak ez du onartzen karaktererik."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "ID Jabber gelak ez du onartzen karaktererik."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ezin duzu txat talde batera sartu konektatuta ez zauden bitartean."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
@@ -6699,276 +6926,301 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "%s naiz"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: ../src/dialogs.py:2568
+#. 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 "Nire kontaktu zerrendara nahi zaitut sartu."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Gehitu"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Eraldatu"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Taldea"
+
+#. 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 "Nire zerrendara gehitu nahi zaitut."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Agindua: %s, akzioa: %s, mota %s, balorea %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "nagoenean"
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6976,38 +7228,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7017,58 +7269,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Besteak"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7076,317 +7328,341 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Komandoa Exekutatu..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "Talde agenda ezarria"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "\"%s\" gela zure talde agendan dago jadanik."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Talde agenda egoki sortu da"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Azalpenak: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "_Sarrerako mezua:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Kontu Eraldaketa"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "Egoerarekin b_at egin"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Ireki OpenPGP Enkriptazioa"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "_Sarrerako mezua:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Orokorra"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Zerbitzariaren Ezaugarriak:"
@@ -7416,7 +7692,7 @@ msgstr "Tamaina: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Zu"
 
@@ -7426,7 +7702,7 @@ msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
@@ -7460,27 +7736,27 @@ msgstr "Errore mezua: %s"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Fitxero transferentzia gelditua beste kontaktuarengatik"
+msgid "File transfer stopped"
+msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
@@ -7500,34 +7776,34 @@ msgstr "Deskribapena: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr ""
 "Izen honekin dagoeneko badago fitxerorik eta ez duzu baimenik gainarazteko."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Zer nahi duzu egitea?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
@@ -7563,53 +7839,53 @@ msgstr "Fitxeroa:"
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ rutinak ez du libglade sostengatzen"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7617,20 +7893,20 @@ msgid ""
 msgstr ""
 "GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim-ek  pywin32  behar du abiarazteko"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7640,11 +7916,11 @@ msgstr ""
 "dezakezu hau."
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7652,25 +7928,34 @@ msgstr ""
 "Beste Gajim prozesu bat abiarazita dagoela dirudi\n"
 "Abiarazi dena den?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "%s konektatu behar zara OpenPGP-rik gabe."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7680,147 +7965,183 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/gajim.py:571
+#: ../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 "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Harpidetza Eskaria"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "\"%s\" kontaktuak baimendu dizu bere egoera ikusteko."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Harpidetza ezabat_u"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 orain dago %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Pasahitza behar da gela honetan sartzeko."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "E_z galdetu berriro  "
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "%d e-posta elkarrizketa duzu"
 msgstr[1] "%d e-posta elkarrizketa dituzu"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7830,83 +8151,93 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Zerrendatik kontaktua ezabatu"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Errorea fitxeroa irakurtzean:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ondo jasoa izan da  %(name)s-ren %(filename)s  fitxeroa."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7914,131 +8245,108 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konektatu"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "E_z galdetu berriro  "
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Talde agenda ezarria"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "\"%s\" gela zure talde agendan dago jadanik."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Talde agenda egoki sortu da"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Agertarazi leiho bat hurrengo irakurri gabeko gertaerarekin"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8047,47 +8355,48 @@ msgstr ""
 "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
 "agertuko dira."
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "kontua"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "Ikusi emandako kontaktuak bakarrik"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Inprimatu erregistratutako kontuen lista"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Aldatu kontaktuaren edo kontaktuen egoera"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "egoera"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "mezua"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "egoera mezua"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8096,19 +8405,23 @@ msgstr ""
 "\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
 "egoera aldatzen"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "hautatua badago, kontaktua kontu honen kontaktu listatik lortuko da."
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8118,29 +8431,29 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp giltza"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "hautatua badago, kode publikoa erabiliz enkriptatuko da mezua"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "hautatua badago, mezua kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8150,212 +8463,217 @@ msgstr ""
 "kontua dira aukerazkoak. `Kontua` bakarrik zehaztu nahi baduzu, `OpenPGP "
 "koderik` gabe, bakarrik `OpenPGP kodea` -entzat zehaztu."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "gaia"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "mezuaren gaia"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "Mezua jaso dugun kontuaren JID-a"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Kontuaren izena"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Fitxero bat bidali kontaktu bati"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "fitxeroa"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "Hautatua badago, fitxero hau kontu hau erabiliz bidaliko da"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Erakutsi preferentzia eta balio guztiak"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Preferentziako aukera ezabatu"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "giltza"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "preferentziaren izena borratzeko"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim-en berezko preferentzien egoera .config fitxategian idatzi"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Zerrendara kontaktua sartu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Sartu kontaktu berria kontu honetara"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Oraingo egoera itzuli (Globala, ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Oraingo egoera mezua itzuli (Globala aukeratu ez badago kontu bat aukeratuta)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Irakurri gabeko mezuen kontaketa itzuli"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ireki  'Txat-a Hasi' leiho"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Elkarrizketa hasi, kontu hau rabiliz"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr " XML bidaltzeko"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "mezuaren edukia"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Gela Berri Sartu"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "-etik"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Gela:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "Izengoitia"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "password"
 msgstr "Pasahitza:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8364,31 +8682,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8397,7 +8715,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8406,7 +8724,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8415,7 +8733,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host okerra"
@@ -8434,177 +8752,180 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "gaiaren izena"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Ezin duzu zure berezko gaia ezabatu"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Ez zaude gela honetan \"%s\"jadanik edo \"%s\" joan da."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s botata izan da %(who)s -engatik: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Baliogabeko izena"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Gela honek ez du gairik"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Gonbidatu  %(contact_jid)s %(room_jid)s. gelara."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Izengoitia aurkitugabea: %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 ""
 "Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. Erabiltzen "
 "ari den baten izengoitia aldatu egin beharko da, baina ez da aldatu "
 "beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango "
 "da ere. Izengoitiak EZ du onartzen tarterik. "
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8613,14 +8934,14 @@ msgstr ""
 "Erabilera: /%s <nickname>, ireki txat pribatu bat espezifikatutako "
 "erabiltzaileari."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "Erabilera: /%s [reason],  itxi leihoa, zergatia erakutsiz behar bada."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8629,7 +8950,7 @@ msgstr ""
 "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
 "arrazoi bat emanez. "
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8638,18 +8959,17 @@ msgstr ""
 "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
 "aukeraz izengoiti bat ezarriz."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Erabilera: /%s <nickname> [reason], ezabatu izengoitiaren bidez aukeratutako "
 "erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
 "espazioak iznegoitian."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8658,83 +8978,97 @@ msgstr ""
 "Erabilera: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta "
 "bidali zehaztutako izengoitiaren erabiltzailera."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Erabilera:/%s , erakutsarazi gelako pertsonen izenak."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Erabilera:  /%s <message>, mezu bat bidali beste komandoak bilatu gabe."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Erabilera:  /%s <nickname>, aldatu zure izengoitia gela hontan."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -8765,83 +9099,83 @@ msgstr "Zehaztapenak"
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Errorea fitxeroa analizatzean:"
 
 #. 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 ""
 "ezin izan da  %s-ri idatzi. Sesio administratzailea euskarria ez dago lanean."
 
 #. 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 ""
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../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 ""
 "Irudia ezin izan da %(type)s formatuan gorde. Gorde %(new_filename)s bezala?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontaktua"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Izengoitia"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Garbitu nahi al duzu datu basea?(EZ DA GOMENDATZEN GAJIM ABIARAZIA BADAGO)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8855,176 +9189,186 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s-ean esan du: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Ziur al zaude hautaturiko kontaktuaren log-a ezabatu nahi duzula?"
 msgstr[1] ""
 "Ziur al zaude hautaturiko kontaktuaren log-ak ezabatu nahi dituzula?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:585
+#: ../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] "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
 msgstr[1] "Ziur al zaude hautaturiko mezuak ezabatu nahi dituzula?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa Historiala %s-rekin"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s orain %(status)s dago: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Ez zaude zerbitzarira konektatuta"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Ziur al zaude hautaturiko mezua ezabatu nahi duzula?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Mezuak"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Mezu Pribatu Berri Bat %s gelatik"
 
-#: ../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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Orokorra"
+msgid "Ignore"
+msgstr "bederatzi"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Informazioa jasoa"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Profila bidaltzen..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Informazio EZ argitaratua"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9032,52 +9376,46 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9085,31 +9423,44 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
+
+#: ../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 "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9118,11 +9469,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9132,52 +9483,57 @@ msgstr ""
 "%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ezabatu nahi al duzu %s taldea zerrendatik?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9186,12 +9542,12 @@ msgstr ""
 "deskonektatuta ikusiko zaitu beti."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9199,16 +9555,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9218,20 +9574,20 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9240,12 +9596,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
 
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3902
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9256,149 +9612,150 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s fitxero bat bidali nahi dizu:"
 msgstr[1] "%s fitxero bat bidali nahi dizu:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Bidali %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Egin %s eta %s metacontacts"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "%s kontua erabiliz "
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda _Moldatu..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Aktibatuta"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Txat Taldea Berria"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
@@ -9415,20 +9772,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Gaia: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9438,7 +9795,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9448,129 +9805,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
-#: ../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 "Baliabideak: "
 
-#: ../src/tooltips.py:335
+#: ../src/tooltips.py:334
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "Gela honetako %(owner_or_admin_or_member)s "
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Azken egoera: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " %s-etik"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Konektatu"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Gela:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Aktibatuta"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Mota:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Gelditua"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../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"
@@ -9586,17 +9933,22 @@ msgstr "Aurkitu gabea"
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Aurkitu gabea"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9604,7 +9956,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9612,33 +9964,92 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Zu eta kontaktua, bien egoera informazioetan interesatuta zaudete"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Zu ez zaude haren egoera informazioan interesatuta, bera zugan interesa du"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Ireki OpenPGP Enkriptazioa"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
+
+#~ msgid "Servers Features"
+#~ msgstr "Zerbitzariaren Ezaugarriak:"
+
+#~ msgid "Your JID:"
+#~ msgstr "Zure JID-a:"
+
+#~ msgid "Name:"
+#~ msgstr "Izena:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host-a"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Ikusi _Zerrenda"
+
+#~ msgid "Modify Account"
+#~ msgstr "Kontua E_raldatu"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" by %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "%s gajim kontua"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Bezeroak</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Bikoiztutako Jabber ID "
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Kontaktu hau dagoeneko Gajim-en konfiguratua dago."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Fitxero transferentzia gelditua beste kontaktuarengatik"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Orokorra"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Aktibatuta"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat ezarritakorik"
@@ -9663,9 +10074,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Berridatzi Pasahitza"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Proxy erabili"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9851,9 +10259,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "_Before time:"
 #~ msgstr "Ordua _baino lehen:"
 
-#~ msgid "_Font:"
-#~ msgstr "_Mota:"
-
 #~ msgid "_Never"
 #~ msgstr "_Inoiz"
 
@@ -9866,9 +10271,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "_Pop it up"
 #~ msgstr "_Agertarazi"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "Address"
 #~ msgstr "Helbidea"
 
@@ -10009,9 +10411,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Bidali %s taldea %s-era"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Egin %s eta %s metacontacts"
-
 #~ msgid "Affiliation:"
 #~ msgstr "Afizioak: "
 
@@ -10042,9 +10441,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgstr[0] "%d mezu pribatu irakurri gabe"
 #~ msgstr[1] "%d mezu pribatu irakurri gabe"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr ""
@@ -10076,9 +10472,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ "Soinu bat entzun MUC mezu bat jasotzean. (Aukera hau bakarrik kontuan "
 #~ "hartzen da kontuaren notify_on_all_muc_messages True bada)"
 
-#~ msgid "Add"
-#~ msgstr "Gehitu"
-
 #~ msgid "Away "
 #~ msgstr "Kanpoan"
 
@@ -10109,9 +10502,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Invalid room or server name"
 #~ msgstr "Baliogabeko gela edo zerbitzari izena"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "vCard argitarapena egina"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Zure informazio pertsonala argitaratua izan da."
 
diff --git a/po/fr.po b/po/fr.po
index 8564a0657..89165b0ca 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12 svn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-10 09:19+0100\n"
-"PO-Revision-Date: 2008-12-04 21:50+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
-"Language-Team: \n"
+"Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +44,7 @@ msgid "_Add Contact..."
 msgstr "_Ajouter un contact..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
@@ -65,7 +65,7 @@ msgid "_Personal Events"
 msgstr "Évènements P_ersonnels"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "Commencer une _discussion..."
 
@@ -97,6 +97,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Veuillez choisir un serveur</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"
@@ -104,62 +108,55 @@ msgstr ""
 "Ajouter ce certificat à la liste des certificats de confiance.\n"
 "Empreinte digitale SHA1 du certificat :\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Cliquez pour voir les fonctionnalités du serveur jabber (comme les "
-"passerelles MSN, ICQ)"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Utiliser l'authentification"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Se connecter quand je clique sur Finir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "J'ai déjà un compte que je veux _utiliser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Gérer..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y :"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Sauver le mot de _passe"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Fonctionnalités du Serveur"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Définir mon profil quand je me connecte"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
@@ -172,25 +169,27 @@ msgstr ""
 "au réseau Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Votre identifiant Jabber :"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avancées"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Nom d'_Hôte :"
 
+#: ../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 "Identifiant _Jabber : "
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
@@ -202,11 +201,6 @@ msgstr "_Port :"
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:16
-msgid "_Username:"
-msgstr "_Nom :"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -215,18 +209,16 @@ msgstr "<b>Divers</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informations personnelles</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Compte"
 
@@ -235,23 +227,22 @@ msgid "Account Modification"
 msgstr "Modification du compte"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Opérations d'administration"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Reconnexion automatique quand la connexion est perdue"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnexion au démarrage"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Chan_ger le mot de passe"
 
@@ -268,38 +259,36 @@ msgstr ""
 "cette option vous désactivez le TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Choisissez une _clé..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Cliquez pour changer le mot de passe du compte"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Cliquez pour demander l'autorisation à tous les contacts d'un autre compte"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Connexion"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "_Éditer les informations personnelles..."
 
 #. 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:1034
-#: ../src/common/helpers.py:1046 ../src/notify.py:515 ../src/notify.py:546
-#: ../src/notify.py:558
+#: ../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"
 
@@ -307,17 +296,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2654
-#: ../src/roster_window.py:5137
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Général"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Serveur :"
 
@@ -340,7 +326,6 @@ msgstr ""
 "des temps de latence pouvant entraîner des déconnexions"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -350,7 +335,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -360,7 +344,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -376,9 +359,8 @@ msgid "Information about you, as stored in the server"
 msgstr "Les informations vous concernant, stockées sur le serveur"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1611
-#: ../src/config.py:2111
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
@@ -388,35 +370,34 @@ msgstr "Pas de clé sélectionnée"
 #. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1162
-#: ../src/config.py:1251 ../src/config.py:1519 ../src/config.py:1524
-#: ../src/config.py:2019 ../src/config.py:2097 ../src/config.py:2110
-#: ../src/config.py:3201 ../src/config.py:3269 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2723
-#: ../src/roster_window.py:2729 ../src/roster_window.py:2734
+#: ../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 "Aucun"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port : "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_té :"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -427,7 +408,7 @@ msgstr ""
 "compte. Le client ayant la plus haute priorité recevra les messages"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "La priorité va changer automatiquement selon votre état."
 
@@ -436,12 +417,12 @@ msgid "Proxy:"
 msgstr "Proxy :"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Ressour_ce: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -456,30 +437,25 @@ msgstr ""
 "(voir plus bas)."
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Enregistrer votre mot de _passe (non sécurisé)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Garder l'_historique des conversations pour tous les contacts"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Envoi des paquets de maintien de connexion"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "S_ynchroniser l'état du compte avec l'état global"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Synchroniser les contacts"
@@ -489,21 +465,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Utiliser _SSL"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Utiliser les proxies pour les transferts de fichiers"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Ajuster selon l'état"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "Identifiant _Jabber : "
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 msgid "_Name:"
 msgstr "_Nom :"
 
@@ -511,11 +482,21 @@ msgstr "_Nom :"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Ajuster selon l'état"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Comptes"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Utiliser l'authentification"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -523,21 +504,18 @@ msgstr ""
 "Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de "
 "passe via une connexion non-sécurisée"
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnexion au démarrage"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Courriel :"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activer"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Prénom :"
 
@@ -548,7 +526,6 @@ msgstr ""
 "GPG comme seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -560,56 +537,98 @@ msgstr ""
 "avez un."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Nom :"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Regrouper les comptes"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5088
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Envoi des paquets de maintien de connexion"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "S_ynchroniser l'état du compte avec l'état global"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Utiliser un _Agent GPG"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Utiliser un nom d'hôte/port personnalisé"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Utiliser un port personnalisé :"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "_Éditer les informations personnelles..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Activer"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nom d'_Hôte :"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Gérer..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port :"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Prévenir avant d'utiliser une connexion non sécurisée"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "utiliser la variable d'environnement HTTP_PROXY"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "utiliser la variable d'environnement HTTP_PROXY"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Compte :"
@@ -796,7 +815,7 @@ msgid "All statuses"
 msgstr "Tous les états"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:290
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Absent(e)"
 
@@ -813,7 +832,7 @@ msgid "Have "
 msgstr "Ai"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisible"
 
@@ -822,7 +841,7 @@ msgid "Launch a command"
 msgstr "Lancer une commande"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Non disponible"
 
@@ -943,7 +962,7 @@ msgstr "Dernière modification :"
 msgid "New entry received"
 msgstr "Nouvel événement reçu"
 
-#: ../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 "Vous avez publié l'article :"
 
@@ -987,11 +1006,19 @@ msgstr "Entrez un nouveau mot de passe :"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Taper votre nouveau message d'état</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 "Activité :"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Humeur :"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Messages prédéfinis :"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Enregistrer comme messages d'état prédéfini..."
 
@@ -1051,11 +1078,11 @@ msgstr "_Ajouter à la liste de contacts"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historique"
 
@@ -1203,7 +1230,7 @@ msgstr ""
 "Contact\n"
 "Bannière"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:743
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Gras"
 
@@ -1223,11 +1250,11 @@ msgstr "Personnalisation des thèmes de Gajim"
 msgid "Gone"
 msgstr "Parti"
 
-#: ../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 "Inactif"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:744
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Italique"
 
@@ -1276,7 +1303,7 @@ msgstr "Changer le _Sujet..."
 msgid "Configure _Room..."
 msgstr "Configurer le _Salon..."
 
-#: ../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 "_Marque-pages"
 
@@ -1308,23 +1335,37 @@ msgstr "_Administrateur"
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: ../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 "_Bloquer"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Membre"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "Pr_opriétaire"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Envoyer un message privé"
 
-#: ../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 "_Débloquer"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_S'exprimer"
 
@@ -1332,13 +1373,13 @@ msgstr "_S'exprimer"
 msgid "Create new post"
 msgstr "Rédiger un article"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:315
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Sujet"
 
@@ -1357,7 +1398,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</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 "Supprimer"
 
@@ -1412,7 +1454,7 @@ msgstr "Chercher :"
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
-#: ../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 "Rejoindre un salon de discussion"
 
@@ -1439,8 +1481,8 @@ msgstr "Récemment :"
 msgid "Room:"
 msgstr "Salon de discussion :"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "Re_joindre"
 
@@ -1468,7 +1510,7 @@ msgstr "Minimiser automatiquement"
 msgid "Print status:"
 msgstr "Afficher l'état :"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Serveur :"
 
@@ -1498,11 +1540,6 @@ msgstr "<b>Paramètres</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
 #, fuzzy
-msgid "B_OSH Port:"
-msgstr "_Port :"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1511,45 +1548,46 @@ msgstr ""
 "Connexion HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxies"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Name:"
-msgstr "Nom :"
-
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:8
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy :"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:9
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Port :"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "Type:"
-msgstr "Type : "
-
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "Use HTTP proxy"
+#: ../data/glade/manage_proxies_window.glade.h:10
+msgid "Use HTTP prox_y"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/glade/manage_proxies_window.glade.h:11
 #, fuzzy
-msgid "Use proxy authentication"
+msgid "Use proxy auth_entication"
 msgstr "Utiliser l'authentification"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Type : "
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Nom :"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Ajouter le contact à la liste de contacts (Ctrl+D)"
@@ -1597,7 +1635,7 @@ msgstr "Afficher le profil du contact (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 "En_voyer"
 
@@ -1695,10 +1733,14 @@ msgstr ""
 "(e)/invisible"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque je me : "
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1712,19 +1754,19 @@ msgstr ""
 "Toujours utiliser les applications par défaut de XFCE4\n"
 "Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Message de conversation :"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Vérifier que Gajim est le client Jabber par _défaut au démarrage"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Paramétrer la couleur et la police de texte de l'interface"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1738,31 +1780,31 @@ msgstr ""
 "Conversations par compte et Roster séparé\n"
 "Conversations par type et Roster séparé"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Afficher l'_activité des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Afficher des informations détaillées de courriels"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Afficher ce que mes contacts écoutent"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Afficher l'humeur des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1772,7 +1814,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quels états de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1782,7 +1824,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1790,11 +1832,11 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Cacher tous les boutons dans les fenêtres de conversations"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1802,7 +1844,7 @@ msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1810,14 +1852,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera également des informations à "
 "propos de l'expéditeur des nouveaux courriels"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Absent(e) quand "
 "l'ordinateur est inutilisé."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1825,7 +1867,7 @@ msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Non disponible "
 "quand l'ordinateur n'a pas été utilisé pendant une plus longue période"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1833,7 +1875,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1841,28 +1883,28 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'activité des contacts dans votre "
 "liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
 "votre roster"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera ce que chaque contact écoute dans "
 "votre roster"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1873,7 +1915,7 @@ msgstr ""
 "définie explicitement par clique droit sur le champ de saisie, la langue par "
 "défaut sera utilisée pour ce contact ou ce salon."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1883,7 +1925,7 @@ msgstr ""
 "contacts non autorisés. Utilisez avec précaution car cela bloque tous les "
 "messages provenant des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1893,7 +1935,7 @@ msgstr ""
 "Veuillez noter qu'en utilisant une encryption E2E, l'utilisateur distant "
 "doit l'accepter, sinon les messages ne seront pas archivés."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1901,7 +1943,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera une notification quand un nouveau "
 "courriel GMail est reçu"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1911,7 +1953,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent(e), occupé(e), etc.)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1919,7 +1961,7 @@ msgstr ""
 "Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
 "message par défaut sera utilisé à la place."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1927,43 +1969,50 @@ msgstr ""
 "Si cette case n'est pas décochée, Gajim va remplacer les émoticônes ASCII "
 "comme « :) » par un équivalent graphique statique ou dynamique"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Archiver les conversations _chiffrées"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Rendre les fenêtres de conversation _compactes"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Me signaler les contacts qui se _connectent"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "M'avertir lors de l'arrivée d'un courrier électronique _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Événements Personnels"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1973,19 +2022,24 @@ msgstr ""
 "Afficher une notification\n"
 "Afficher uniquement dans le Roster"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "L'afficher dans la zone de notifications"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1993,139 +2047,145 @@ msgstr ""
 "Certains messages peuvent contenir du texte complexe (formatage, couleurs, "
 "etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "État"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "_Icônes d'état :"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Le message de statut d'auto-absence. S'il est vide, Gajim ne modifiera pas "
 "le message de statut actuel"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Le message de statut d'auto-idle. S'il est vide, Gajim ne modifiera pas le "
 "message de statut actuel"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Utiliser la valeur par _défaut"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Quand un nouvel événement est reçu :"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "Passer _Absent(e) après :"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Afficher les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "É_moticônes :"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer le formatage complexe du texte dans les messages entrants"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Message _entrant :"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Message s_ortant :"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "Utilise_r les couleurs par défaut"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "_Envoyer les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "Mise à valeur des _URL :"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "Comportement de la _fenêtre :"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "dans les _salons de discussion"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "dans le _roster"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutes"
 
@@ -2173,7 +2233,7 @@ msgstr "Identifiant Jabber :"
 msgid "Order:"
 msgstr "Ordre :"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Liste privée"
 
@@ -2238,108 +2298,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Entreprise :</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Pays :</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Département :</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Courriel :</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Adresse 2 :</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Nom de Famille :</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Nom complet</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Prénom :</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Site perso :</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Deuxième :</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Nom :</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Surnom :</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Téléphone :</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position :</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Code postal :</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Préfixe :</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Rôle :</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Région :</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Rue :</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffixe :</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "À propos"
 
@@ -2349,17 +2409,17 @@ msgstr "Cliquez pour choisir votre avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Informations personnelles"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Emploi"
 
@@ -2377,8 +2437,8 @@ msgstr "Supprimer le compte de Gajim et du _serveur"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5125
-#: ../src/roster_window.py:5603 ../src/roster_window.py:5732
+#: ../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 "_Supprimer"
 
@@ -2400,14 +2460,14 @@ msgstr "Éditer les _groupes..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5675
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5556
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_viter à"
 
@@ -2417,7 +2477,7 @@ msgstr "Suppri_mer"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5053 ../src/roster_window.py:5641
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
 
@@ -2442,12 +2502,6 @@ msgstr "Commencer une _discussion"
 msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5116 ../src/roster_window.py:5593
-#: ../src/roster_window.py:5722
-msgid "_Block"
-msgstr "_Bloquer"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Interdire de voir mon état"
@@ -2469,16 +2523,34 @@ msgstr "_Renommer..."
 msgid "_Subscription"
 msgstr "_Autorisation"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5587
-#: ../src/roster_window.py:5719
-msgid "_Unblock"
-msgstr "_Débloquer"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Ne plus ignorer"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Ajouter un contact..."
@@ -2504,56 +2576,62 @@ msgid "Profile, A_vatar"
 msgstr "Profil et _avatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Afficher les Contacts _déconnectés"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Afficher les Passerelles"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Afficher les Contacts _déconnectés"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Comptes"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "Act_ions"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "Envoyer un _message simple..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Affichage"
 
@@ -2570,11 +2648,11 @@ msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5744
+#: ../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:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Rechercher"
 
@@ -2662,10 +2740,6 @@ msgstr "Requête d'Inscription"
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
@@ -2690,10 +2764,6 @@ msgstr "Envoyer un _message simple"
 msgid "Show All Pending _Events"
 msgstr "Montrer les _événements en attente"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Montrer la _liste de contacts"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "É_tat"
@@ -2711,49 +2781,54 @@ msgstr "<b>Requête :</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Client :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Région :</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Identifiant Jabber :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Statut :</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abonnement :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Système :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Commentaires"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Avatar configuré :"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contact"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Informations du Contact"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Complément"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Avatar de l'utilisateur :"
 
@@ -2765,6 +2840,11 @@ msgstr "<b>Trafic Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrée XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activer"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2793,13 +2873,13 @@ msgstr "Assigner une clé Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Renommer"
 
@@ -2823,31 +2903,27 @@ msgstr "Ressource :"
 msgid "Status:"
 msgstr "État :"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Modifier le compte"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Annuler la confirmation"
 
-#: ../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 ""
 "Vous êtes en train d'éxecuter une commande. Êtes vous sûr de vouloir "
 "l'annuler ?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Le service a modifié l'identifiant de la session."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Le service a envoyé des données mal-formées"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Le service a modifié l'identifiant de la session."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
@@ -2872,7 +2948,7 @@ msgstr "Entier"
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:763
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Couleur"
 
@@ -2897,171 +2973,196 @@ msgstr "(Aucune)"
 msgid "Hidden"
 msgstr "Éléments masqués"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Vous avez publié l'article :"
+
 #. 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 "Anglais"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Biélorusse"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgare"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Breton"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Tchèque"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Allemand"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Grec"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Anglais (Britannique)"
 
-#: ../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 "Espagnol"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Basque"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Français"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croate"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italien"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norvégien"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polonais"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugais"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Portugais brésilien"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russe"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbe"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovaque"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Suédois"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Chinois"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
 
 #. we are not connected
-#: ../src/chat_control.py:358 ../src/chat_control.py:546
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:359 ../src/chat_control.py:547
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/chat_control.py:745
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/chat_control.py:746
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Barré"
 
-#: ../src/chat_control.py:769
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Police"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Style par défaut"
 
-#: ../src/chat_control.py:1209 ../src/chat_control.py:1611
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Si vous envoyez un fichier à %s, il/elle connaîtra votre véritable "
+"identifiant Jabber."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Chiffrement GPG activé"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1238 ../src/chat_control.py:2105
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:72
-#: ../src/common/helpers.py:302 ../src/conversation_textview.py:860
-#: ../src/dialogs.py:903 ../src/gajim.py:983 ../src/gajim.py:1643
-#: ../src/normal_control.py:483 ../src/roster_window.py:911
-#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1870 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3115 ../src/roster_window.py:5237
-#: ../src/roster_window.py:5422
+#: ../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 "Absent de la liste"
 
-#: ../src/chat_control.py:1370 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Une liste des transferts de fichier actifs, terminés et arrêtés"
+
+#: ../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 "Artiste Inconnu"
 
-#: ../src/chat_control.py:1372 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: ../src/chat_control.py:1374 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: ../src/chat_control.py:1378 ../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"
@@ -3070,26 +3171,17 @@ msgstr ""
 "<b>« %(title)s »</b> par <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1383
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s par %(artist)s\n"
-"de %(source)s"
-
-#: ../src/chat_control.py:1506
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s du salon de discussion %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1591 ../src/dialogs.py:3907
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/chat_control.py:1592
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3097,50 +3189,50 @@ msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages avec GPG."
 
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:1626
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:1628
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1648
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1652
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "et NON authentifiée"
 
 #. 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:1658
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3149,26 +3241,26 @@ msgstr ""
 "Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
 "Votre discussion %(logged)s archivée."
 
-#: ../src/chat_control.py:1706
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Commande non prise en charge pour les comptes zeroconf."
 
-#: ../src/chat_control.py:1717 ../src/groupchat_control.py:1651
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/chat_control.py:1720 ../src/groupchat_control.py:1665
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1670
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, cache les boutons de discussion."
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1686
+#: ../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 "
@@ -3177,38 +3269,38 @@ msgstr ""
 "Utilisation : /%(command)s <action>, envoie l'action au salon actuel. "
 "Utilise la troisième personne. (ex : /%(command)s explose.)"
 
-#: ../src/chat_control.py:1731
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Utilisation : /%s, envoie un ping au contact"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, envoie le message au contact"
 
-#: ../src/chat_control.py:1737 ../src/groupchat_control.py:1709
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:1876
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: ../src/chat_control.py:1879
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: ../src/chat_control.py:1881
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: ../src/chat_control.py:1886
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3216,25 +3308,25 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: ../src/chat_control.py:1888
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:1916 ../src/chat_control.py:1929
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:1922
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Le message suivant n'a été chiffré"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vous venez de recevoir un nouveau message de \"%s\""
 
-#: ../src/chat_control.py:2294
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3242,15 +3334,15 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2442 ../src/common/connection_handlers.py:1846
-#: ../src/common/connection_handlers.py:1892
-#: ../src/common/connection_handlers.py:2080
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1239
-#: ../src/gajim.py:178
+#: ../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 "Erreur de base de données"
 
-#: ../src/chat_control.py:2443
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3259,7 +3351,7 @@ msgstr ""
 "Le fichier de base de données (%s) ne peut être lu. Essayez de le réparer ou "
 "supprimez le (toutes les archives seront perdues)."
 
-#: ../src/chat_control.py:2679
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
@@ -3268,135 +3360,147 @@ msgstr "%(name)s est maintenant %(status)s"
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../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 est un fichier mais devrait être un répertoire"
 
-#: ../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 va maintenant s'arrêter"
 
-#: ../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 est un répertoire mais devrait être un fichier"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Modifier les informations du statut"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Modifier le statut"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Choisissez le type de présence et la description"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Disponible pour Discuter"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Connecté"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Longue absence"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Hors-ligne - Déconnecté(e)"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Description de la présence :"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "L'état a été changé."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Quitter des Groupes de Discussion"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s dans %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Vous n'avez pas joint de groupe de discussion."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Choisissez les groupes de discussion que vous voulez quitter"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:72 ../src/roster_window.py:785
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:5013
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Salons de discussion"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Vous avez quitté les groupes de discussion suivants :"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Transférer les messages non-lus"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Tous les messages non-lus ont été transmis."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Utiliser DBus et Notification-Daemon pour afficher les notifications"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Temps en minutes, au bout duquel votre état basculera absent(e)."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Absent(e) car inactif depuis plus de $T min)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S sera remplacé par le message de statut, $T par le temps d'auto-absence"
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Temps en minutes après lequel votre état basculera non disponible."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Non disponible car inactif depuis plus de $T min)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S sera remplacé par the message de statut, $T par le temps d'auto-idle"
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
@@ -3404,21 +3508,21 @@ msgstr ""
 "repliés."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:461
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3131
+#: ../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 "Par défaut"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Activer la messagerie link-local/zeroconf "
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Langue utilisée par le vérificateur orthographique"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3429,7 +3533,7 @@ msgstr ""
 "minute.\n"
 "'never' - ne jamais afficher l'heure."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3441,19 +3545,19 @@ msgstr ""
 "valeur 0. Ceci est utilisé seulement lorsque la valeur de print_time est "
 "'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 "Traiter les paires de * / _ comme des éventuels caractères de formatage."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Si vrai ne supprime pas */_ . Donc *abc* sera en gras mais sans supprimer "
 "les * *"
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3463,7 +3567,7 @@ msgstr ""
 "Pour la syntaxe voir http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (si vous voulez utiliser cela, installez docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3471,7 +3575,7 @@ msgstr ""
 "Caractère à ajouter après un surnom en utilisant la complétion automatique "
 "(tab) dans un salon de discussion."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3479,7 +3583,7 @@ msgstr ""
 "Caractère ajouté automatiquement après un surnom s'il est déjà utilisé dans "
 "un salon de discussion."
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3490,19 +3594,19 @@ msgstr ""
 "documentation python de strftime pour une documentation complète : http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caractères affichés avant le surnom dans les conversations"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caractères affichés après le surnom dans les conversations"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3510,12 +3614,12 @@ msgstr ""
 "Nombre de lignes de l'historique à afficher lorsque l'onglet ou la fenêtre "
 "de discussion est ouvert à nouveau."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Durée de vie en minutes des dernières lignes des conversations précédentes."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3523,13 +3627,13 @@ msgstr ""
 "Envoyer le message avec Ctrl+Entrée et aller à la ligne avec Entrée "
 "(comportement par défaut du client ICQ de Mirabilis)."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 "Nombre de lignes à stocker pour le rappel des lignes précédentes (avec Ctrl"
 "+flèche vers le haut)."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3538,13 +3642,13 @@ msgstr ""
 "Soit une url personnalisée contenant %s où %s est le mot/la phrase, soit "
 "\"WIKTIONARY\", ce qui signifie l'utilisation de wikitionary."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Si cette case est cochée, Gajim pourra être contrôlé à distance via gajim-"
 "remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3555,13 +3659,13 @@ msgstr ""
 "automatiquement l'état des comptes (en autant que listen_to_network_manager "
 "n'est pas désactivé et qu'ils soient synchronisés à l'état global)."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifications d'états envoyées. Peut être all, composing_only ou disabled."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3569,7 +3673,7 @@ msgstr ""
 "Notifications d'états affichées dans les fenêtres de conversations. Peut "
 "être all, composing_only ou disabled."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3577,12 +3681,12 @@ msgstr ""
 "Au lieu d'afficher l'heure à chaque message (print_time==sometimes), "
 "l'afficher toutes les x minutes."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Demander avant de fermer un onglet ou une fenêtre de discussion de salon."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3590,7 +3694,7 @@ msgstr ""
 "Toujours demander avant de fermer les onglets/fenêtres de salons de cette "
 "liste séparés par des espaces."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3598,7 +3702,13 @@ msgstr ""
 "Ne jamais demander avant de fermer onglets/fenêtres des salons de cette "
 "liste séparées par des espaces."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3607,35 +3717,27 @@ msgstr ""
 "interfaces locales, pour les transferts de fichiers dans le cas de "
 "traduction  d'adresse / redirection de port."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "M'alerter à l'aide de l'icône dans la zone de notifications."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Afficher la bordure fenêtres de discussion à onglets ?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
-"principe que vous voulez archiver vos conversations ?"
-
-#: ../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 "
@@ -3648,18 +3750,18 @@ msgstr ""
 "sécurisés, mais prennent plus de temps pour le calcul quand vous commencez "
 "une session."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Aperçu des nouveaux messages dans un popup ?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Une liste de mots séparés par des points-virgules qui seront mis en "
 "surbrillance dans les salons."
 
-#: ../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."
@@ -3668,14 +3770,14 @@ msgstr ""
 "fenêtre. Cette option n'est prise en compte que si l'icône dans la barre de "
 "notification est utilisée."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Si vrai, Gajim vérifiera qu'il est le client Jabber par défaut à chaque "
 "démarrage."
 
-#: ../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."
@@ -3683,7 +3785,7 @@ msgstr ""
 "Si vrai, Gajim affichera dans chaque onglet une icône contenant les messages "
 "non lus. En fonction du thème, cette icône peut être animée."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3691,13 +3793,13 @@ msgstr ""
 "Si Vrai, Gajim affichera le message d'état, s'il n'est pas vide, sous le nom "
 "de chaque contact dans la liste des contacts."
 
-#: ../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 ""
 "Définir la position de l'avatar dans le roster. Peut être à droite (right) "
 "ou à gauche (left)."
 
-#: ../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."
@@ -3705,7 +3807,7 @@ msgstr ""
 "Si Vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
 "précédente ou dont la version en cache a expiré."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3713,7 +3815,7 @@ msgstr ""
 "Si Faux, vous ne verrez plus les lignes d'état dans les conversations quand "
 "un contact modifie son état et/ou son message d'état."
 
-#: ../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 "
@@ -3728,32 +3830,32 @@ msgstr ""
 "affichera seulement « TRUC vient de rejoindre/quitter le groupe de discussion "
 "»."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se connecter."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 "Couleur d'arrière-plan des contacts lorsqu'ils viennent de se déconnecter."
 
-#: ../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 ""
 "Si Vrai, les messages restaurés utiliseront une police de texte plus petite "
 "que la normale."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne pas afficher d'avatars particuliers pour les passerelles."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne pas afficher d'icône dans la barre des tâches."
 
-#: ../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 "
@@ -3763,7 +3865,7 @@ msgstr ""
 "clignoter (comportement par défaut dans la plupart des gestionnaires de "
 "fenêtres) la fenêtre quand elle contient des événements non lus."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3774,7 +3876,7 @@ msgstr ""
 "l'information sha dans les salons."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3793,36 +3895,36 @@ msgstr ""
 "'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
 "la même fenêtre."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Si Faux, vous ne verrez plus les avatars dans les fenêtres de conversation."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Si Vrai, appuyer sur la touche d'échappement fermera l'onglet ou la fenêtre "
 "de conversation."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Cacher les boutons dans les fenêtres de conversations."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Cache la bannière dans les fenêtres de discussions"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Cache la liste des occupants du salon dans les fenêtres des salons de "
 "discussion."
 
-#: ../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."
@@ -3830,15 +3932,15 @@ msgstr ""
 "Dans une conversation, affiche le surnom au début d'une ligne seulement "
 "lorsque ce n'est pas la même personne qui a écrit le dernier message."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation lors du fusionnement d'un surnom répété."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Défilement doux dans la fenêtre de conversation"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3846,13 +3948,13 @@ msgstr ""
 "Liste des couleurs, séparées par « : », qui seront utilisées pour colorier "
 "les surnoms dans les salons de discussion."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab pour basculer au prochain onglet lorsqu'aucun d'entre eux n'a de "
 "nouveaux messages non lus."
 
-#: ../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."
@@ -3861,7 +3963,7 @@ msgstr ""
 "métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
-#: ../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 "
@@ -3872,7 +3974,7 @@ msgstr ""
 "connecté avec une priorité négative, vous ne recevrez AUCUN message en "
 "provenance de votre serveur."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3880,7 +3982,16 @@ msgstr ""
 "Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
 "les mots de passe des comptes."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Si vrai, Gajim va utiliser Gnome Keyring (s'il est disponible) pour stocker "
+"les mots de passe des comptes."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3888,7 +3999,7 @@ msgstr ""
 "Si vrai, Gajim montrera le nombre de contacts connectés et totaux sur les "
 "lignes de groupe et de compte"
 
-#: ../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"
@@ -3896,7 +4007,7 @@ msgstr ""
 "Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages "
 "entrant comme des messages de ce type"
 
-#: ../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."
@@ -3904,7 +4015,7 @@ msgstr ""
 "Si Activé, Gajim scrollera et sélectionnera le contact qui vous a envoyé le "
 "dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
 
-#: ../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."
@@ -3913,13 +4024,13 @@ msgstr ""
 "image, en utilisant dvips et convert avant de l'insérer dans la fenêtre de "
 "conversation."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se "
 "faire."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3927,7 +4038,7 @@ msgstr ""
 "Nombre maximum de lignes affichées dans les conversations. Les lignes les "
 "plus vieilles sont effacées."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3935,12 +4046,12 @@ msgstr ""
 "Si Activé, les fenêtres de notification du notification-daemon seront "
 "attachées à l'icône du Tray."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
 
-#: ../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."
@@ -3948,16 +4059,22 @@ msgstr ""
 "Modifiez la valeur pour changer la taille des formules latex affichées. Plus "
 "la valeur est grande, plus la taille l'est."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Schémas d'uri valides. Seuls les schémas dans cette liste seront acceptés "
 "comment « vraies » uri."
 
-#: ../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."
@@ -3965,7 +4082,7 @@ msgstr ""
 "La priorité va changer automatiquement selon votre état. Les priorités sont "
 "définies dans les options autopriority_*."
 
-#: ../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"
@@ -3975,28 +4092,28 @@ msgstr ""
 "(indisponible), dnd (Occupé(e)) ou Invisible. NOTE : cette option n'est "
 "utilisée que si l'option restore_last_status est désactivée"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Si activé, restaure le dernier statut qui était utilisé."
 
-#: ../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 ""
 "Si désactivé, ne pas signaler les présences avec une clef GPG, même si GPG "
 "est configuré."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Activer le chiffrage ESessions pour ce compte."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée quand cela "
 "est possible ?"
 
-#: ../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"
@@ -4004,37 +4121,46 @@ msgstr ""
 "Liste ordonnée de types de connexion, séparés par des virgules, à essayer. "
 "Peut contenir tls, ssl ou plain."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
 "connexion non-chiffrée."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Afficher un message d'avertissement avant d'utiliser la librairie SSL "
 "standard."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Liste d'erreurs ssl, séparées par une virgule, à ignorer."
 
-#: ../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
+#, fuzzy
 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 ""
 "Nombre de secondes d'attente pour la réponse du Paquet d'Entretien de "
 "Connexion avant de tenter de se connecter."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de 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."
@@ -4042,19 +4168,27 @@ msgstr ""
 "Si cette case est cochée, Gajim utilisera votre IP et les proxies définis "
 "dans l'option file_transfer_proxies pour les transferts de fichiers."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Répondre aux demandes d'accusés de réception"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Envoyer des demandes d'accusés de réception"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Durant la négociation d'une session chiffrée, Gajim doit-il partir du "
+"principe que vous voulez archiver vos conversations ?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4062,101 +4196,101 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
 "contact quand cela est possible ?"
 
-#: ../src/common/config.py:404 ../src/common/config.py:407
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "tous ou par état (séparé par des espaces)"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ou 'both'"
 
-#: ../src/common/config.py:415 ../src/common/config.py:417
-#: ../src/common/config.py:418 ../src/common/config.py:421
-#: ../src/common/config.py:422
+#: ../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' ou ''"
 
-#: ../src/common/config.py:428 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dort"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:430 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:432 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Travaille"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:440 ../src/config.py:1451
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: ../src/common/config.py:443 ../src/common/config.py:444
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4164,70 +4298,101 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: ../src/common/config.py:455
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son émis lors de l'arrivée d'un message de salon de discussion."
 
-#: ../src/common/config.py:464 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:468 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:72
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Impossible de charger le module d'inactivité"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Hôte erroné"
 
-#: ../src/common/connection_handlers.py:235
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Adresse locale invalide ? :-O"
 
-#: ../src/common/connection_handlers.py:640
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "L'information d'enregistrement pour la passerelle %s n'est pas arrivée à "
 "temps"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1844
-#: ../src/common/connection_handlers.py:1890
-#: ../src/common/connection_handlers.py:2078
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1237
-#: ../src/gajim.py:400
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "S'enregistrer à %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "La connexion a échoué"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Erreur d'Écriture du disque"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:867
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:868
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1240
-#: ../src/gajim.py:179
+#: ../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 "Identifiant Jabber invalide"
+
+#: ../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: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."
@@ -4237,78 +4402,77 @@ msgstr ""
 "(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
 "archives seront perdues)."
 
-#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Surnom invalide : %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2040
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2046
-#: ../src/common/connection_handlers.py:2049
-#: ../src/common/connection_handlers.py:2053 ../src/gajim.py:563
+#: ../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 "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni du salon %s."
 
-#: ../src/common/connection_handlers.py:2044
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Le salon %s n'existe pas."
 
-#: ../src/common/connection_handlers.py:2047
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2050
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon %s."
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres du salon %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2096
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: ../src/common/connection_handlers.py:2103
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: ../src/common/connection_handlers.py:2130
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2151
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2153
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4319,218 +4483,223 @@ msgstr ""
 "tel que http://jru.jabberstudio.org pour le supprimer"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../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 "Vous serez connecté à %s sans OpenPGP."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Impossible d'obtenir le certificat de l'émetteur "
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Impossible d'obtenir un certificat CRL"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Impossible de déchiffrer la signature du certificat"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Impossible de déchiffrer la signature du CRL"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Impossible de déchiffrer la clef public de l'émetteur"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Échec de la signature du certificat"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "Échec de la signature CRL"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Le certificat n'est pas encore valide"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Le certificat a expiré"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "CRL n'est pas encore valide"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "CRL a expiré"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Erreur de format dans le champ notBefore du certificat"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Erreur de format dans le champ notAfter du certificat"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Erreur de format dans le champ lastUpdate du CRL"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Erreur de format dans le champ nextUpdate du CRL"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Mémoire insuffisante"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Certificat auto-signé"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Certificat auto-signé dans la chaîne de certificat"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "Impossible de récupérer le certificat de l'émeteur local"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "Impossible de vérifier le premier certificat"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Chaîne du certificat trop longue"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Certificat révoqué"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Certificat CA invalide"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Longueur du chemin dépassée"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Objet du certificat non-supporté"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Certificat non approuvé"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Certificat refusé"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Décalage du sujet de l'émetteur"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Décalage dans les clés d'identification de l'authorité et du sujet"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Décalage dans les numéros de série de l'authorité et du sujet"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: ../src/common/connection.py:268
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
 
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Le serveur %s a fourni une forme d'inscription différente"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
 #. wrong answer
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:343
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "La passerelle %(name)s a mal répondu à la requête d'enregistrement : %(error)"
 "s"
 
-#: ../src/common/connection.py:523
-msgid "Connection to proxy failed"
-msgstr "La connexion au proxy a échoué"
-
-#: ../src/common/connection.py:622 ../src/common/connection.py:730
-#: ../src/common/connection.py:1372
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:623 ../src/gajim.py:1060
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:710
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Enregistré dans : %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "La connexion au proxy a échoué"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: ../src/common/connection.py:658 ../src/common/connection.py:711
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "La connexion avec le compte %s a été perdue. Essayez de vous connecter à "
 "nouveau."
 
-#: ../src/common/connection.py:680
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "L'authentification du certificat %s peut être invalide."
 
-#: ../src/common/connection.py:683
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4539,7 +4708,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:685
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4548,24 +4717,24 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:756
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:758
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
-#: ../src/common/connection.py:819
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4574,13 +4743,18 @@ msgstr ""
 "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une "
 "des ressources connectées. Désactivez la et réessayez."
 
-#: ../src/common/connection.py:1116
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 "Il n'est pas possible d'envoyer un fichier vide"
+
+#: ../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 "Le présence distante n'est pas signée et aucune clef n'a été assignée."
 
-#: ../src/common/connection.py:1118
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 ""
@@ -4588,12 +4762,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1127
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
 
-#: ../src/common/connection.py:1227
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4602,20 +4776,30 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1405
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Inviter des _Contacts"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:72
-#: ../src/gajim.py:983
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observateurs"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:72 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1349 ../src/gajim.py:809 ../src/roster_window.py:815
-#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
+#: ../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 "Passerelles"
 
@@ -4625,11 +4809,11 @@ msgstr "Pas dans la liste"
 
 # Traduction moins mauvaise mais pas terrible: binding=lier, attacher
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "La passerelle python - D-Bus n'est pas installée sur cet ordinateur"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Les possibilités D-Bus de Gajim ne peuvent pas être utilisées"
 
@@ -4658,1033 +4842,1043 @@ msgstr ""
 "Le bus de session n'est pas disponible.\n"
 "Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "douze"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "un"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "deux"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "trois"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "quatre"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "cinq"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "six"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sept"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "huit"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "neuf"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dix"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "onze"
 
+#. 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 "douze"
+msgid "%(0)s o'clock"
+msgstr "%(0)s heure"
 
-#. 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 heure"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 heure cinq"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s heure cinq"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 heure dix"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s heure dix"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 heure et quart"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s heure et quart"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 heure vingt"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s heure vingt"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 heure vingt cinq"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s heure vingt cinq"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 heure et demi"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s heure et demi"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$1 heure moins vingt cinq"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(1)s heure moins vingt cinq"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "$1 heure moins vingt"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "%(1)s heure moins vingt"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "$1 heure moins le quart"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "%(1)s heure moins le quart"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "$1 heure moins dix"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "%(1)s heure moins dix"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "$1 heure moins cinq"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "%(1)s heure moins cinq"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 heure"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s heure"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Nuit"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Tôt le matin"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Matin"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Près de midi"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Midi"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Après-midi"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Soir"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Tard en soirée"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Début de la semaine"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Milieu de la semaine"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Fin de la semaine"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:215
-#, python-format
-msgid "%s GiB"
-msgstr "%s Gio"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:218
-#, python-format
-msgid "%s GB"
-msgstr "%s Go"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:222
-#, python-format
-msgid "%s MiB"
-msgstr "%s Mio"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:225
-#, python-format
-msgid "%s MB"
-msgstr "%s Mo"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:229
-#, python-format
-msgid "%s KiB"
-msgstr "%s Kio"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:232
-#, python-format
-msgid "%s KB"
-msgstr "%s Ko"
-
-#. B means bytes
-#: ../src/common/helpers.py:235
-#, python-format
-msgid "%s B"
-msgstr "%s o"
-
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "O_ccupé(e)"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Occupé(e)"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:283 ../src/features_window.py:119
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Absent(e)"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "Déc_onnecté(e)"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:311
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:313
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Membre"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "écrit un message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:409
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
-#: ../src/common/helpers.py:983 ../src/common/helpers.py:990
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s Gio"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s Go"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s Mio"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s Mo"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s Kio"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s Ko"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s o"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message en attente"
 msgstr[1] "%d messages en attente"
 
-#: ../src/common/helpers.py:996
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " du salon %s"
 
-#: ../src/common/helpers.py:999 ../src/common/helpers.py:1018
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "de l'utilisateur %s"
 
-#: ../src/common/helpers.py:1001
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr "de %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1015
+#: ../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ènement en attente"
 msgstr[1] "%d événements en attente"
 
-#: ../src/common/helpers.py:1048
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Erreur en exécutant « %(command)s » : %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s n'est pas un loglevel valide"
+
 #. 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 "erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Compte Gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "du compte %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Effrayé(e)"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Épaté(e)"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Amoureux(se)"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "En colère"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Ennuyé(e)"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Anxieux(se)"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Excité(e)"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Honteux(se)"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Ennuyé(e)"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Courageux(se)"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Calme"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Prudent(e)"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Froid(e)"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Confiant(e)"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Confus(e)"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Contemplatif(ve)"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Satisfait(e)"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Grincheux(se)"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Cinglé(e)"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Créatif(ve)"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Curieux(se)"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Découragé(e)"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Déprimé(e)"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Déçu(e)"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Écœuré(e)"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Estomaqué(e)"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Distrait(e)"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Embarrassé(e)"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Envieux(se)"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Excité(e)"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Dragueur(se)"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustré(e)"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Reconnaissant(e)"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "En deuil"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Grognon(ne)"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Coupable"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Heureux(se)"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "optimiste"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Bouillant(e)"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Humble"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Humilié(e)"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Affamé(e)"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Blessé(e)"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Impressionné(e)"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Craintif(ve)"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Amoureux(se)"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Indigné(e)"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Intéressé(e)"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Intoxiqué(e)"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Invincible"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Jaloux(se)"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Solitaire"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Perdu(e)"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Chanceux(se)"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Méchant(e)"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Morose"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nerveux(se)"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Neutre"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Outré(e)"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Scandalisé(e)"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Enjoué(e)"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Fier(e)"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Détendu(e)"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Soulagé(e)"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Plein(e) de remords"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Impatient(e)"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarcastique"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Satisfait(e)"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Concentré(e)"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Choqué(e)"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Timide"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Malade"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Endormi(e)"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Spontané(e)"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Stressé(e)"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Fort(e)"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Surpris(e)"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Reconnaissant(e)"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Assoiffé(e)"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Fatigué(e)"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Indéfini"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Faible"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Inquiet(e)"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Fait des corvées"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Achète des provisions"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Fait le ménage"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Cuisine"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Fait de la maintenance"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Fait la vaisselle"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Lave le linge"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Jardine"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Fait une course"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Promène le chien"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Boit"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Prend une bière"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Prend un café"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Prend un thé"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Prend un snack"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Prend le petit-déjeuner"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Soupe"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Dîne"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Fait de l'exercice"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Fait du vélo"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Danse"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Fait de la randonnée"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Fait un jogging"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Fait du sport"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Court"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Skie"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Nage"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "S'entraine"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Se toilette"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "À la station thermale"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Se brosse les dents"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Se fait couper les cheveux"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Se rase"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Prend un bain"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Prend une douche"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "A un rendez-vous"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "En congé"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Traîne"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Se cache"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "En vacances"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Fait une prière"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "En vacances organisées"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Réfléchit"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Se relaxe"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Pêche"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Joue"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Sort"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Fait la fête"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Lit"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Se prépare"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Fait les magasins"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Fume"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Se socialise"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Prend un bain de soleil"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Regarde la télé"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Regarde un film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Discute"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "Dans la vraie vie"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Au téléphone"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "En visioconférence"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Voyage"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Fait la navette"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Conduit"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "En voiture"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "En bus"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "En avion"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "En train"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "En séjour"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Marche"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Code"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "En réunion"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Étudie"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Écrit"
 
@@ -5703,7 +5897,7 @@ msgstr ""
 "transfert de fichiers sera annulé."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5720,17 +5914,17 @@ msgstr ""
 "L'hôte %s que vous avez spécifié dans l'option avancée "
 "« ft_add_hosts_to_send » est invalide, il a été ignoré."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Pour continuer à envoyer et recevoir des messages, vous devez vous "
 "reconnecter."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Erreur d'Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5739,31 +5933,31 @@ msgstr ""
 "%s\n"
 "La messagerie en « link-local » pourrait ne pas fonctionner correctement."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Veuillez vérifier si Avahi ou Bonjour sont installés."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Impossible de lancer le service local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossible de débloquer le port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Vérifiez si avahi-daemon est actif."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossible de changer l'état du compte « %s »"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5772,66 +5966,50 @@ msgstr ""
 "être envoyé."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Ce message est chiffré]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Votre message n'a pas pu être envoyé."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Le destinataire est déconnecté. Votre message n'a pas pu être envoyé."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "La connexion à l'hôte n'a pas pu être établie : délai d'envoi des données "
 "dépassé"
 
-#: ../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 "Erreur en ajoutant le service. %s"
 
-#: ../src/config.py:150 ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Actif"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Événement"
-
-#: ../src/config.py:402
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: ../src/config.py:409
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:451
-msgid "Always use OS/X default applications"
-msgstr "Toujours utiliser les applications OS/X par défaut."
-
-#: ../src/config.py:452
-msgid "Custom"
-msgstr "Personnalisé"
-
-#: ../src/config.py:645 ../src/dialogs.py:1199
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:646
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5840,254 +6018,213 @@ msgstr ""
 "Vous devez installer le dictionnaire %s pour la vérification orthographique, "
 "ou choisir un autre langage en paramétrant l'option speller_language."
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Premier message reçu"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Message Reçu Suivant Avec le Focus."
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Message Reçu Suivant Sans le Focus"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Contact connecté"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Contact déconnecté"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Message envoyé"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Message d'un salon mis en surbrillance"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Message reçu dans un salon"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "Courriel Gmail reçu"
-
 #. Name column
-#: ../src/config.py:1373 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
-#: ../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 "Nom"
 
-#: ../src/config.py:1459
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1460
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Si vous voulez que vos changements soit appliqués immédiatement, vous devez "
 "vous reconnecter."
 
-#: ../src/config.py:1585 ../src/config.py:1684
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1720 ../src/config.py:1763
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Toutes les fenêtres de conversation et de salons de discussion seront "
 "fermées. Voulez-vous continuer ?"
 
-#: ../src/config.py:1759
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1760
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Pour changer le nom du compte, vous devez être déconnecté."
 
-#: ../src/config.py:1764
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "Pour changer le nom du compte, vous devez lire tous ses événements."
 
-#: ../src/config.py:1770
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ce nom est déjà utilisé par un autre de vos comptes. Choisissez un autre nom."
 
-#: ../src/config.py:1775 ../src/config.py:1779
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1776
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1780
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1854
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:1855
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:1873 ../src/config.py:1881 ../src/config.py:1924
-#: ../src/config.py:3139 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Identifiant Jabber invalide"
-
-#: ../src/config.py:1882
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un Identifiant Jabber doit être de la forme \"user@servername\"."
 
-#: ../src/config.py:2072 ../src/config.py:3211
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2073 ../src/config.py:3212
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Il y a eu un problème durant la récupération de vos clés OpenPGP secrètes."
 
-#: ../src/config.py:2130
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2131
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2138
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Vous devez d'abord créer votre compte avant d'éditer vos informations."
 
-#: ../src/config.py:2146 ../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 "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2147
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2151
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2152
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2183
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2184
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Veuillez le renommer et l'enlever avant d'activer la messagerie link-local."
 
-#: ../src/config.py:2367
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2369
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2405
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2406
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2457 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2465
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2501
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6095,11 +6232,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2503
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2504
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6107,11 +6244,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2506
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2507
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6119,11 +6256,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6131,14 +6268,15 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2511
+#: ../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 ""
 "Peut être d'une des formes suivantes :\n"
 "1. pseudo@domaine/ressource (seulement cette ressource correspond).\n"
@@ -6148,84 +6286,89 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2608
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2630 ../src/gajim.py:1432 ../src/roster_window.py:1932
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2631 ../src/roster_window.py:1906
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2632 ../src/roster_window.py:1933
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2641
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2738
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:2738
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:2739
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:2740
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "Aucun"
 
-#: ../src/config.py:2808
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2842
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
-#: ../src/config.py:3122
-msgid "Invalid username"
-msgstr "Nom d'utilisateur non valide"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Nom d'utilisateur invalide"
 
-#: ../src/config.py:3124
-msgid "You must provide a username to configure this account."
-msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Surnom invalide : %s"
 
-#: ../src/config.py:3150
-msgid "Duplicate Jabber ID"
-msgstr "Identifiant Jabber dupliqué"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Serveur invalide"
 
-#: ../src/config.py:3151
-msgid "This account is already configured in Gajim."
-msgstr "Ce compte est déjà configuré dans Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Entrée invalide"
 
-#: ../src/config.py:3168
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3169 ../src/config.py:3358
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6235,24 +6378,32 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3187
-msgid "Invalid server"
-msgstr "Serveur invalide"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Votre nouveau compte a été créé avec succès"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3188
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Vous devez entrer un nom d'utilisateur pour configurer ce compte."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3239 ../src/gajim.py:2010
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3240 ../src/gajim.py:2011
+#: ../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 "Ce certificat est déjà dans le fichier %s, il n'a donc pas été ajouté."
 
-#: ../src/config.py:3308
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6267,7 +6418,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3314 ../src/gajim.py:2034
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6278,14 +6429,10 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3337 ../src/config.py:3376
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3357
-msgid "Your new account has been created successfully"
-msgstr "Votre nouveau compte a été créé avec succès"
-
 #: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
@@ -6294,7 +6441,51 @@ msgstr "Le nom du compte est utilisé"
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Actif"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Événement"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Premier message reçu"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Message Reçu Suivant Avec le Focus."
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Message Reçu Suivant Sans le Focus"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Contact connecté"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Contact déconnecté"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Message envoyé"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Message d'un salon mis en surbrillance"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Message reçu dans un salon"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Courriel Gmail reçu"
+
+#: ../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"
@@ -6304,7 +6495,7 @@ msgstr ""
 "été reçu par le contact distant. Si cette icône reste\n"
 "pendant un long moment, le message a probablement été perdu."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6312,77 +6503,77 @@ msgstr ""
 "Le texte sous cette règle correspond à ce qui a été dit depuis\n"
 "la dernière fois que vous avez consulté ce salon de discussion"
 
-#: ../src/conversation_textview.py:691
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Quitter"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:703
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:708
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:738
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: ../src/conversation_textview.py:741
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
-#: ../src/conversation_textview.py:1014 ../src/conversation_textview.py:1032
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Erreur en exécutant « %(command)s » : %(error)s"
-
-#: ../src/conversation_textview.py:1289
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Hier"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1293
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Identifiant Jabber déjà existant"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "L'identifiant Jabber que vous avez entré est déjà dans la liste. Veuillez en "
 "choisir un autre."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "nouveau@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nouveau%d@jabber.id"
@@ -6397,144 +6588,144 @@ msgstr "Nom du contact : <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Identifiant Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Définir l'Humeur"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Message d'état"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Remplacer le message de statut ?"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ce nom est déjà utilisé. Voulez vous remplacer ce message de statut ?"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Enregistrer comme messages d'état prédéfini"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Tapez un nom pour ce message d'état"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Adresse AIM :"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Numéro GG :"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Numéro ICQ :"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Adresse MSN :"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Adresse Yahoo! :"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Pour finir, nous voulons remercier tous les mainteneurs de paquet."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Yann Le Boulanger <asterix@lagaule.org>\n"
 "Jonathan Ernst <jonathan@ernstfamily.ch>\n"
 "Florent Le Coz <louizatakk@fedoraproject.org>"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6547,93 +6738,93 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Le pseudonyme contient des caractères non autorisés."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Requête d'inscription pour le compte %(account)s de la part de %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2635
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1451
-#: ../src/groupchat_control.py:1732
-msgid "The nickname has not allowed characters."
-msgstr "Le pseudonyme contient des caractères non autorisés."
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1899
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1900
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "L'identifiant jabber du salon de discussion contient des caractères "
 "interdits."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s n'est pas un nom de salon de discussion valide"
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Vous ne pouvez pas vous synchroniser avec un compte sauf s'il est connecté."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../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:"
@@ -6642,275 +6833,300 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../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 "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
 #. 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 "Contact connecté"
 
-#: ../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 "Contact déconnecté"
 
 #. 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 "Nouveau message"
 
 #. 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 "Nouveau message simple"
 
 #. 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 "Nouveau message privé"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1597 ../src/notify.py:486
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1663 ../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 "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1563 ../src/gajim.py:1630
-#: ../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 "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1705 ../src/gajim.py:1727
-#: ../src/gajim.py:1744 ../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 "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1708 ../src/notify.py:484
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1453 ../src/notify.py:488
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:490
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2559
+#. 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 "Je souhaiterais vous ajouter à ma liste de contacts."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Morose"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Identifiant Jabber :"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Groupe"
+
+#. 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 "Je souhaiterais vous ajouter à ma liste de contacts."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordre : %(order)s, action : %(action)s, type : %(type)s, valeur : %(value)s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Vous devez entrer un nom pour créer une liste privée."
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vous a invité dans le salon de discussion %(room_jid)s"
 
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
 #. # means number
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3351
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "quand je suis "
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6921,19 +7137,19 @@ msgstr ""
 "\n"
 "La Short Authentication String cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:3833 ../src/dialogs.py:3920
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Identité du contact vérifiée"
 
-#: ../src/dialogs.py:3841
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Vérifier à nouveau..."
 
-#: ../src/dialogs.py:3846
+#: ../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 "
@@ -6943,19 +7159,19 @@ msgstr ""
 "messages et vous en envoyer, vous devez vérifier son identité en cliquant "
 "sur le bouton en-dessous."
 
-#: ../src/dialogs.py:3849 ../src/dialogs.py:3901 ../src/dialogs.py:3914
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Identité du contact NON vérifiée"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Vérifier..."
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6970,24 +7186,24 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Avec vous parlé au contact et vérifié la SAS ?"
 
-#: ../src/dialogs.py:3902
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "La clef du contact (%s) <b>ne correspond pas</b> à la clef assignée dans "
 "Gajim."
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages."
 
-#: ../src/dialogs.py:3915
+#: ../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."
@@ -6996,7 +7212,7 @@ msgstr ""
 "sa clef</b>, les messages <b>ne peuvent</b> donc <b>pas</b> être chiffrés. "
 "Utilisez votre client GPG pour avoir confiance en cette clef."
 
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7004,33 +7220,33 @@ msgstr ""
 "Une clef GPG est assignée à ce contact, et vous avez confiance en sa clef, "
 "les messages seront donc chiffrés."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Autres"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7038,226 +7254,250 @@ msgstr ""
 "Il n'y a aucun service à l'adresse indiquée, ou bien il ne répond pas. "
 "Veuillez vérifier l'adresse et réessayer."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Ce type de service ne contient pas d'élément à parcourir."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Exécuter une commande"
 
-#: ../src/disco.py:1190 ../src/disco.py:1354
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanne %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Utilisateurs"
 
 # ccount). Description column
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Marque-page déjà spécifié"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Marque-page ajouté avec succès"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
+"contacts."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Nœud"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nouvel article"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Erreur de certificat SSL"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Une librairie utilisée pour valider les certificats des serveurs afin "
 "d'assurer une connexion sécurisée."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Nécessite python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Conversation sans serveur avec détection automatique des clients dans un "
 "réseau local."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Nécessite python-avahi"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Nécessite pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Commandes : %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Un script permettant de contrôler Gajim avec des lignes de commande."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Nécessite python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88
+#: ../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 "Fonctionnalité indisponible sous Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenPGP"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Bascule le chiffrement _GPG"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Chiffrement des messages à l'aide de clefs GPG."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Nécessite gpg et python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Auto-détection du statut de la connexion."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Nécessite gnome-network-manager et python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Gestion de la Session"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "La session Gajim est enregistrée à la déconnexion et restaurée à la "
 "connexion."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Nécessite python-gnome2"
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Mot de passe pour entrer dans le salon"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Les mots de passe peuvent être stockés de façon sécurisée et non pas "
 "seulement en texte."
 
-#: ../src/features_window.py:75
-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 "Nécessite gnome-keyring et python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 "Possibilité de se connecter à des serveurs qui utilisent des entrées SRV."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Nécessite dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Nécessite nslookup afin d'utiliser les enregistrements SRV."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Vérificateur d'Orthographe"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Vérification ortohgraphique des messages composés."
 
-#: ../src/features_window.py:83
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Nécessite python-gnome2-extras ou un compilation du module gtkspell depuis "
-"les sources Gajim."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Nécessite python-dbus."
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Notifications"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Notification de nouveaux événements via des popups."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7265,54 +7505,55 @@ msgstr ""
 "Nécessite python-notify ou python-dbus en conjonction avec notification-"
 "daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Trayicon"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Une icône dans le tray indiquant la présence courante."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Nécessite python-gnome2-extras ou une compilation du module trayicon depuis "
 "les sources Gajim."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Nécessite PyGTK >= 2.10."
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Inactif"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Ajuster selon l'état"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Possibilité de mesurer le temps d'inactivité, afin de définir un statut "
 "automatique."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:92
 #, fuzzy
 msgid "Requires libxss library."
 msgstr "Nécessite python-dbus."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Nécessite python-gnome2"
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transforme les expressions LaTeX entre $$ $$."
 
-#: ../src/features_window.py:99
+#: ../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."
@@ -7320,7 +7561,7 @@ msgstr ""
 "Nécessite texlive-latex-base et dvipng. Vous devez définir « use_latex » à "
 "True dans l'éditeur de configuration avancée."
 
-#: ../src/features_window.py:100
+#: ../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."
@@ -7328,23 +7569,25 @@ msgstr ""
 "Nécessite texlive-latex-base et dvipng (tout est dans MikTeX). Vous devez "
 "définir « use_latex » à True dans l'éditeur de configuration avancée."
 
-#: ../src/features_window.py:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Chiffrement de bout en bout"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Chiffrement de la conversation."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Nécessite python-crypto."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Générateur RST"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7352,24 +7595,24 @@ msgstr ""
 "Génère une sortie XHTML à partir d'un code RST (voir  http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Nécessite python-docutils."
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Possibilité d'avoir des URL cliquables dans les bannières des conversations."
 
-#: ../src/features_window.py:111 ../src/features_window.py:112
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Nécessite python-sexy."
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Fonctionnalité"
 
@@ -7398,7 +7641,7 @@ msgstr "Taille : %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:496
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Vous"
 
@@ -7408,7 +7651,7 @@ msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Destinataire : "
 
@@ -7440,26 +7683,27 @@ msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Transfert de fichier arrêté par votre contact"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Transfert de fichier interrompu"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Description :"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
@@ -7479,12 +7723,12 @@ msgstr "Description : %s"
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../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 "Impossible de remplacer le fichier existant \"%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."
@@ -7492,22 +7736,22 @@ msgstr ""
 "Un fichier du même nom existe déjà et vous n'avez pas la permission de "
 "l'écraser."
 
-#: ../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 "Ce fichier existe déjà"
 
-#: ../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 "Que voulez vous faire ?"
 
 #. 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 "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: ../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 "Vous n'avez pas les permissions de créer des fichiers dans ce dossier."
 
@@ -7543,11 +7787,11 @@ msgstr "Fichier : "
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Expéditeur : "
 
@@ -7555,36 +7799,40 @@ msgstr "Expéditeur : "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:93
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s n'est pas un loglevel valide"
-
-#: ../src/gajim.py:165
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim a besoin d'un serveur X pour démarrer. Fermeture..."
 
-#: ../src/gajim.py:194
-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 a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#: ../src/gajim.py:195
-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 a besoin de PyGTK 2.8 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:197
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim a besoin de GTK 2.8 ou supérieur"
 
-#: ../src/gajim.py:198
-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 a besoin de GTK 2.8 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
 
-#: ../src/gajim.py:205
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7593,22 +7841,22 @@ msgstr ""
 "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
 "dernière version stable à partir de %s"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
 "système."
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim a besoin de pywin32 pour s'exécuter"
 
-#: ../src/gajim.py:221
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7616,11 +7864,11 @@ msgid ""
 msgstr "Assurez-vous que Pywin32 est installé. Vous pouvez l'obtenir ici : %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim est déjà en cours d'exécution"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7628,26 +7876,36 @@ msgstr ""
 "Gajim semble déjà être en cours d'exécution\n"
 "Démarrer quand même ?"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/gajim.py:501
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Aucune clef GPG assignée"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Vous serez connecté à %s sans OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:516
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: ../src/gajim.py:517
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 
-#: ../src/gajim.py:564
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7658,50 +7916,59 @@ msgstr ""
 "utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gajim.py:578
+#: ../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 "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: ../src/gajim.py:583
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
 
-#: ../src/gajim.py:631 ../src/notify.py:492 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: ../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 "Erreur %(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 "erreur en envoyant %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Requête d'Inscription"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:998
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Le contact \"%s\" vous a autorisé à voir son état."
 
-#: ../src/gajim.py:1017
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:1018
+#: ../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?"
@@ -7709,75 +7976,80 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: ../src/gajim.py:1059
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Désinscrire"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:1235 ../src/groupchat_control.py:1162
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s est maintenant connu en tant que %(new_nick)s"
 
-#: ../src/gajim.py:1253 ../src/groupchat_control.py:1337
-#: ../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 est maintenant %(status)s"
 
-#: ../src/gajim.py:1316
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s a changé le sujet en %(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:1380 ../src/groupchat_control.py:1122
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1391
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: ../src/gajim.py:1401
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Un mot de passe est requis pour rejoindre le salon %s. Veuillez le taper."
 
-#: ../src/gajim.py:1467
+#: ../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"
@@ -7785,27 +8057,56 @@ msgstr ""
 "Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
 "GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:1472
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG n'est pas utilisable"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
+"chiffrer les messages."
+
+#: ../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 "_Ne plus me poser la question"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring est installé mais pas \t\t\t\t\t\t\tcorrectement démarré "
+"(variable d'environnement probablement \t\t\t\t\t\t\tmal configurée)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouveau courriel sur %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1576
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Vous avez %d nouveau courrier électronique"
 msgstr[1] "Vous avez %d nouveaux courriers électroniques"
 
-#: ../src/gajim.py:1589
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7820,35 +8121,45 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1660
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gajim.py:1728
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Enlever le contact de la liste"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erreur de lecture du fichier :"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Vous avez bien reçu %(filename)s de la part de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1732
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 "Le transfert du fichier %(filename)s de la part de %(name)s est arrêté."
 
-#: ../src/gajim.py:1745
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1749
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Le transfert du fichier %(filename)s à %(name)s est arrêté."
 
-#: ../src/gajim.py:1837
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7857,36 +8168,36 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: ../src/gajim.py:1844
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: ../src/gajim.py:1916
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: ../src/gajim.py:1928
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: ../src/gajim.py:1941
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: ../src/gajim.py:1952
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Erreur."
 
-#: ../src/gajim.py:1977
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/gajim.py:1978
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7894,11 +8205,11 @@ msgstr ""
 "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
 "entrer une nouvelle"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7909,19 +8220,19 @@ msgstr ""
 "serveur Jabber : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: ../src/gajim.py:2037
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: ../src/gajim.py:2052
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: ../src/gajim.py:2053
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7935,11 +8246,11 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: ../src/gajim.py:2076
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7947,16 +8258,11 @@ msgstr ""
 "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
 "chiffrée. Êtes vous sûr de vouloir le faire ?"
 
-#: ../src/gajim.py:2078 ../src/gajim.py:2108
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Oui, je veux vraiment me connecter de façon non-sécurisée"
 
-#: ../src/gajim.py:2079 ../src/gajim.py:2109 ../src/groupchat_control.py:1841
-#: ../src/roster_window.py:3769
-msgid "Do _not ask me again"
-msgstr "_Ne plus me poser la question"
-
-#: ../src/gajim.py:2106
+#: ../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?"
@@ -7965,21 +8271,21 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "Le nœud PEP n'a pas été supprimé"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2592 ../src/gajim.py:2614
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/gajim.py:2593
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7987,7 +8293,7 @@ msgstr ""
 "Votre thème d'émoticônes n'a pu être trouvé, les émoticônes sont donc "
 "désactivées."
 
-#: ../src/gajim.py:2615
+#: ../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 "
@@ -7997,7 +8303,7 @@ msgstr ""
 "mettre à jour le format du fichier emoticons.py. Voir http://trac.gajim.org/"
 "wiki/Emoticons pour plus de détails."
 
-#: ../src/gajim.py:2641 ../src/roster_window.py:3303
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
@@ -8005,51 +8311,32 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2920
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gajim.py:3017
-msgid "Bookmark already set"
-msgstr "Marque-page déjà spécifié"
-
-#: ../src/gajim.py:3018
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
-
-#: ../src/gajim.py:3031
-msgid "Bookmark has been added successfully"
-msgstr "Marque-page ajouté avec succès"
-
-#: ../src/gajim.py:3032
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
-"contacts."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Afficher l'aide pour une commande"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "commande"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "montrer l'aide sur la commande"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Montre ou cache la fenêtre principale"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Afficher une fenêtre avec le prochain message non lu"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -8057,47 +8344,48 @@ msgstr ""
 "Affiche une liste de tous les contacts de la liste. Chaque contact apparaît "
 "sur une ligne séparée"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "compte"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "montrer seulement les contacts du compte spécifié"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Affiche la liste des comptes enregistrés"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Change l'état du ou des compte(s)"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "état"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "message"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "Message d'état"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8106,21 +8394,25 @@ msgstr ""
 "changer l'état de tous les compte qui ont l'option \"synchroniser avec "
 "l'état global\" activée"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Montre la fenêtre de discussion pour que vous puissiez envoyer un message à "
 "un contact"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "L'identifiant Jabber du contact avec lequel vous voulez discuter"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8130,29 +8422,29 @@ msgstr ""
 "compte sont facultatifs. Si vous voulez seulement renseigner le paramètre "
 "'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "L'identifiant Jabber du contact qui recevra le message"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "contenu du message"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "clé pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "Si spécifié, le message sera chiffré en utilisant cette clé publique"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "Si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8162,135 +8454,135 @@ msgstr ""
 "et le compte sont facultatifs. Si vous voulez seulement renseigner le "
 "paramètre 'compte' sans 'clé pgp', mettez simple la valeur '' pour 'clé pgp'."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "sujet"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "sujet du message"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Envoie un nouveau message à un salon que vous avez rejoint."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "L'identifiant Jabber du salon qui recevra le message"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Récupère les informations détaillées d'un contact"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "L'identifiant Jabber du contact"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Récupère les informations détaillées d'un compte"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Nom du compte"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "fichier"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Chemin du fichier"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "si spécifié, le message sera envoyé en utilisant ce compte"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Liste toutes les préférences et leurs valeurs"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Définir la valeur de 'clé' à 'valeur'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'clé' est le nom de la préférence, 'valeur' est la valeur à assigner"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Supprime une option de préférence"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "touche"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nom de la préférence a supprimer"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Écrit les préférences actuelles de Gajim dans le fichier .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Ajouter le contact à la liste"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "identifiant Jabber"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Ajoute un nouveau contact à ce compte"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Renvoie le message d'état actuel (global à moins qu'un compte ne soit "
 "spécifié)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Renvoie le nombre de messages non-lus"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Ouvre la fenêtre « Commencer une discussion »"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Commencer une discussion en utilisant ce compte"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Envoyer du XML personnalisé"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML à envoyer"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8298,67 +8590,72 @@ msgstr ""
 "Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
 "à tous les comptes"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Gère une URI du type xmpp:"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI à gérer"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Compte avec lequel vous voulez le gérer"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "contenu du message"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Joindre un groupe de discussions"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "groupe de discussion"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID du salon"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "pseudonyme"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "mot de passe"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Mot de passe pour entrer dans le salon"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Le compte avec lequel vous voulez entrer dans le salon"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8367,17 +8664,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser "
 "gajim-remote."
 
-#: ../src/gajim-remote.py:403
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8386,16 +8683,16 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:407
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8404,7 +8701,7 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:480
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8413,7 +8710,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:485
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8422,7 +8719,7 @@ msgstr ""
 "L'argument \"%(arg)s\" n'est pas précisé.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:504
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Mauvaise adresse (URI)"
 
@@ -8439,177 +8736,179 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Veuillez créer un nouveau thème vierge avec le nom que vous désirez."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nom du thème"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Vous ne pouvez pas supprimer le thème actuellement utilisé"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:149
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:151
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Vous n'êtes plus dans le salon « %(room)s » ou « %(nick)s » l'a quitté."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:602
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: ../src/groupchat_control.py:604
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
-#: ../src/groupchat_control.py:1025
-msgid "Really send file?"
-msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
-
-#: ../src/groupchat_control.py:1026
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Si vous envoyez un fichier à %s, il/elle connaîtra votre véritable "
-"identifiant Jabber."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1125
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Le serveur à défini ou midifié votre Surnom de salon"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1136
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s a été éjecté par %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1151
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s a été banni par %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1198 ../src/groupchat_control.py:1202
-#: ../src/groupchat_control.py:1207
+#: ../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 a été éjecté du salon (%(reason)s)"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** L'affiliation de %(nick)s a été définie à %(affiliation)s par %(actor)s"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** L'affiliation de %(nick)s a été définie à %(affiliation)s"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s par %(actor)s"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Le rôle de %(nick)s a été défini à %(role)s"
 
-#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1731
-msgid "Invalid nickname"
-msgstr "Nom d'utilisateur invalide"
-
-#: ../src/groupchat_control.py:1474 ../src/groupchat_control.py:1492
-#: ../src/groupchat_control.py:1576 ../src/groupchat_control.py:1593
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Ce salon de discussion n'a pas de sujet"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr ""
 "Contact %(contact_jid)s invité dans le salon de discussion %(room_jid)s."
 
-#: ../src/groupchat_control.py:1654
+#: ../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 "Surnom introuvable : %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 ""
 "Utilisation : /%s <surnom|identifiant Jabber> [raison], bannit l'identifiant "
 "Jabber du salon. Le surnom de l'occupant peut être utilisé s'il ne contient "
 "pas de \"@\". Si l'identifiant Jabber est actuellement dans le salon il sera "
 "également éjecté. Ne supporte pas les espaces dans le surnom."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8618,7 +8917,7 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de conversation privée avec "
 "l'occupant(e) spécifié(e)."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8627,7 +8926,7 @@ msgstr ""
 "Utilisation : /%s [raison], ferme la fenêtre ou l'onglet courant en "
 "affichant la raison si spécifiée."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8636,7 +8935,7 @@ msgstr ""
 "Utilisation : /%s <identifiant Jabber> [raison], invite l'identifiant Jabber "
 "dans le salon actuel, la raison est optionnelle."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8645,18 +8944,17 @@ msgstr ""
 "Utilisation : /%s <salon>@<serveur>[/surnom], propose de rejoindre "
 "salon@serveur en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_control.py:1681
-#, 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 ""
 "Utilisation : /%s <surnom> [raison], éjecte l'occupant portant le surnom "
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_control.py:1690
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8665,23 +8963,23 @@ msgstr ""
 "Usage : /%s <surnom> [message], ouvre une fenêtre de discussion privée et "
 "envoie le message à l'occupant(e) spécifié(e) par le surnom."
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Utilisation : /%s , affiche les noms des occupants du salon."
 
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Utilisation : /%s [sujet], affiche ou met à jour le sujet actuel du salon."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8689,39 +8987,53 @@ msgstr ""
 "Utilisation : /%s <message>, envoie un message sans chercher d'autres "
 "commandes."
 
-#: ../src/groupchat_control.py:1835
+#: ../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 "Utilisation : /%s <surnom>, change votre surnom dans ce salon."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Êtes-vous sûr de vouloir quitter le salon \"%s\" ?"
 
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Si vous fermez cette fenêtre, vous serez déconnecté(e) de ce salon."
 
-#: ../src/groupchat_control.py:1874
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1875
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1880
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1906
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:1907
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8729,22 +9041,22 @@ msgstr ""
 "Vous êtes sur le point de supprimer définitivement ce salon.\n"
 "Vous pouvez spécifier une raison ci-dessous :"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2080
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:2081 ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2372
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -8775,77 +9087,77 @@ msgstr "Détails"
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Erreur lors de l'analyse du fichier :"
 
 #. 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 "N'a pas pu écrire dans %s. La gestion des sessions ne fonctionnera pas"
 
 #. 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 n'est pas le client Jabber par défaut"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez vous faire de Gajim le client Jabber par défaut ?"
 
-#: ../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 ""
 "Toujours vérifier que Gajim est le client Jabber par défaut au démarrage"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
-#: ../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 ""
 "L'image ne peut être enregistrée en format %(type)s. Enregistrer en tant que "
 "%(new_filename)s ?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Message"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8853,7 +9165,7 @@ msgstr ""
 "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8867,26 +9179,26 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez..."
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exportation de l'historique..."
 
-#: ../src/history_manager.py:509
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s le %(time)s a dit: %(message)s\n"
 
-#: ../src/history_manager.py:546
+#: ../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] "Voulez vous réellement supprimer l'historique de ce contact ?"
 msgstr[1] "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#: ../src/history_manager.py:550 ../src/history_manager.py:585
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Ceci est une opération irréversible."
 
-#: ../src/history_manager.py:582
+#: ../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] "Voulez-vous vraiment supprimer le message sélectionné ?"
@@ -8916,27 +9228,37 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:433
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Vous n'êtes pas connecté au serveur"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Voulez-vous vraiment supprimer le message sélectionné ?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:435
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:437
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Messages"
 
@@ -8948,66 +9270,67 @@ msgstr "- les messages seront archivés"
 msgid "- messages will not be logged"
 msgstr "- les messages ne seront pas archivés"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nouveau message privé dans le salon %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 "Message de %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Générique"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignorer"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2768
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2771
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2773 ../src/roster_window.py:2784
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
@@ -9039,54 +9362,46 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:286 ../src/roster_window.py:940
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté(e)."
 
-#: ../src/roster_window.py:1909
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring est installé mais pas \t\t\t\t\t\t\tcorrectement démarré "
-"(variable d'environnement probablement \t\t\t\t\t\t\tmal configurée)"
-
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:2103 ../src/roster_window.py:3247
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2104 ../src/roster_window.py:3248
+#: ../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?"
@@ -9094,15 +9409,28 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2130
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505
+#: ../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 "Êtes-vous sûr de vouloir quitter le salon \"%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 "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2269
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9110,16 +9438,16 @@ msgstr ""
 "Les messages seront disponibles pour une lecture ultérieure si l'archivage "
 "de l'historique est actif et si le contact est dans votre liste."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9127,11 +9455,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9141,52 +9469,57 @@ msgstr ""
 "passerelles : %s"
 
 #. it's jid
-#: ../src/roster_window.py:2649
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:2650
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Voulez-vous enlever le groupe %s de la liste de contacts ?"
 
-#: ../src/roster_window.py:2716
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Supprimer également de votre roster tous les contacts appartenant à ce groupe"
 
-#: ../src/roster_window.py:2755
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3108
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Le contact \"%s\" sera enlevé de la liste de contacts"
 
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9195,11 +9528,11 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3117
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: ../src/roster_window.py:3121
+#: ../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."
@@ -9207,16 +9540,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9226,20 +9559,20 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Vous devez créer un compte avant de pouvoir discuter avec d'autres contacts."
 
-#: ../src/roster_window.py:3687
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Le stockage des métacontacts n'est pas supporté par votre serveur"
 
-#: ../src/roster_window.py:3689
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9248,14 +9581,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:3763
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Vous êtes sur le point de créer un métacontact. Êtes-vous sûr de vouloir "
 "continuer ?"
 
-#: ../src/roster_window.py:3765
+#: ../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 "
@@ -9265,139 +9598,141 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes Jabber ou des comptes de transport."
 
-#: ../src/roster_window.py:3878
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:3889
+#: ../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] "Voulez vous envoyer ce fichier à %s :"
 msgstr[1] "Voulez vous envoyer ces fichiers à %s :"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Envoyer %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Envoyer un fichier à un contact"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4566 ../src/roster_window.py:4637
-#: ../src/roster_window.py:4646 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "du compte %s"
 
 #. add
-#: ../src/roster_window.py:4653
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4695 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:4755
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4817 ../src/roster_window.py:4926
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:4844
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:4851
-msgid "Mood"
-msgstr "Humeur"
-
-#: ../src/roster_window.py:4855
-msgid "Activity"
-msgstr "Activité"
-
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5014
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
 #. Send Group Message
-#: ../src/roster_window.py:5022 ../src/roster_window.py:5548
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5030
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
 #. Send single message
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5693
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nouveau Salon de Discussion"
 
 #. History manager
-#: ../src/roster_window.py:5967
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:5976
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -9414,20 +9749,20 @@ msgstr "Erreur dans la forme des données reçues"
 msgid "No result"
 msgstr "Aucun résultat."
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Erreur d'écriture du disque"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Sujet : %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9442,7 +9777,7 @@ msgstr ""
 "\n"
 "\tCes options sont-elles acceptables ?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9457,124 +9792,116 @@ msgstr ""
 "\n"
 "Continuer la session ?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "Identifiant Jabber :"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../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 de ce salon"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [bloqué]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimisé]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Dernier état : %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " depuis %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Déconnecté(e)"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Humeur :"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Activité :"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Ton :"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:En pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Ce service n'a pas encore renvoyé d'informations détaillées"
 
-#: ../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"
@@ -9590,23 +9917,28 @@ msgstr "Inconnu"
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Inconnu"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Ce contact s'intéresse à votre état mais vous ne vous intéressez pas au sien"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9614,12 +9946,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "vôtre"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vous et ce contact vous intéressez à vos états réciproques"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9627,19 +9959,108 @@ msgstr ""
 "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéresse pas "
 "au vôtre"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Vous attendez la réponse de ce contact pour votre demande de voir son état"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Cliquez pour voir les fonctionnalités du serveur jabber (comme les "
+#~ "passerelles MSN, ICQ)"
+
+#~ msgid "Servers Features"
+#~ msgstr "Fonctionnalités du Serveur"
+
+#~ msgid "Your JID:"
+#~ msgstr "Votre identifiant Jabber :"
+
+#, fuzzy
+#~ msgid "B_OSH Port:"
+#~ msgstr "_Port :"
+
+#~ msgid "Name:"
+#~ msgstr "Nom :"
+
+#~ msgid "Show _roster"
+#~ msgstr "Montrer la _liste de contacts"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Sélectionnez le compte avec lequel vous voulez vous synchroniser"
+
+#~ msgid "Modify Account"
+#~ msgstr "Modifier le compte"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s par %(artist)s\n"
+#~ "de %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Compte Gajim %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#~ msgid "Custom"
+#~ msgstr "Personnalisé"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Identifiant Jabber dupliqué"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Ce compte est déjà configuré dans Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Nécessite python-gnome2-extras ou un compilation du module gtkspell "
+#~ "depuis les sources Gajim."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Inactif"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Transfert de fichier arrêté par votre contact"
+
+#~ msgid "Generic"
+#~ msgstr "Générique"
+
+#~ msgid "Mood"
+#~ msgstr "Humeur"
+
+#~ msgid "Activity"
+#~ msgstr "Activité"
+
 #~ msgid "_Host:"
 #~ msgstr "_Serveur :"
 
@@ -9648,10 +10069,6 @@ msgstr " ressource avec la priorité "
 #~ "Nécessite la compilation du module d'inactivité depuis les sources de "
 #~ "Gajim."
 
-#, fuzzy
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Bascule le chiffrement _GPG"
-
 #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 #~ msgstr ""
 #~ "Cette commande n'existe pas: /%s (précédez la de /say pour l'envoyer)"
diff --git a/po/gl.po b/po/gl.po
index 40942de22..9ac2aef5c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,13 +5,14 @@
 # This file is distributed under the same license as the gajim package.
 # Automatically generated, 2004.
 #
+# Iván Méndez López <>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-03-13 11:38+0100\n"
-"Last-Translator: Iván Méndez López\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:51+0200\n"
+"Last-Translator: Iván Méndez López <>\n"
 "Language-Team:  <softwarelibre@udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +43,7 @@ msgid "_Add Contact..."
 msgstr "_Engadir un contacto..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Descubrir os servizos"
 
@@ -65,7 +66,7 @@ msgid "_Personal Events"
 msgstr "Información persoal"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Iniciar a charla"
@@ -100,68 +101,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Prema para ver as características (como transportes de MSN e ICQ) dos "
-"servidores de Jabber"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usar a autenticación"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Conectar cando prema Rematar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: asistente para crear unha conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Xa teño unha conta e quero empregala"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Xestionar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "_Gardar o contrasinal"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Características dos servidores"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Configurar o meu perfil ao me conectar"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Usa un nome de host e un porto personalizados"
 
@@ -174,31 +172,32 @@ msgstr ""
 "á rede Jabber"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "O seu identificador JID"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Rematar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nome do host:"
 
+#: ../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 "ID de _Jabber: "
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "C_ontrasinal:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porto:"
 
@@ -206,11 +205,6 @@ msgstr "_Porto:"
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Nome de usuario:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -219,18 +213,16 @@ msgstr "<b>Varios</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información persoal</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Conta"
 
@@ -239,25 +231,24 @@ msgid "Account Modification"
 msgstr "Modificar a conta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Listaxe de administradores"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Conectar automaticamente se se perde a conexión"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar ao inicio de Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Cam_biar o contrasinal"
 
@@ -274,37 +265,35 @@ msgstr ""
 "TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Elixir a _chave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Prema para cambiar o contrasinal da conta"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Conexión"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "_Editar a información persoal..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -312,17 +301,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Xeral"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome do host:"
 
@@ -346,7 +332,6 @@ msgstr ""
 "para previr que expire a conexión"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -356,7 +341,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -366,7 +350,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -382,43 +365,45 @@ msgid "Information about you, as stored in the server"
 msgstr "A súa información, para se gardar no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Non se seleccionou ningunha chave"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Ningún"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Información persoal"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porto: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Pr_ioridade:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -429,7 +414,7 @@ msgstr ""
 "O cliente con maior prioridade recibe os acontecementos."
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "A prioridade mudará automaticamente segundo o seu estado."
 
@@ -438,13 +423,13 @@ msgid "Proxy:"
 msgstr "Proxy"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Re_curso: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -460,30 +445,25 @@ msgstr ""
 "máis abaixo)."
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Gardar o contrasinal (inseguro)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Gravar as conversas para todos os contactos"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantemento de actividade"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar o estado da conta co estado global"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -494,21 +474,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (o antigo)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Usar proxies para as transferencias de ficheiros"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Adaptar ao estado"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "ID de _Jabber: "
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 #, fuzzy
 msgid "_Name:"
 msgstr "_Nome: "
@@ -518,31 +493,38 @@ msgstr "_Nome: "
 msgid "<b>Proxy</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Adaptar ao estado"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usar a autenticación"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Correo electrónico:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Nome:"
 
@@ -552,7 +534,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -563,56 +544,96 @@ msgstr ""
 "Podería considerar mudar algúns aspectos da configuración da protección."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Apelido(s):"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Combinar as contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Enviar paquetes de mantemento de actividade"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizar o estado da conta co estado global"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Usa un nome de host e un porto personalizados"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Usar o porto personalizado:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "_Editar a información persoal..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Activar"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome do host:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Xestionar..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porto:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Conta:"
@@ -806,7 +827,7 @@ msgid "All statuses"
 msgstr "Todos os estados"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Ausente"
 
@@ -823,7 +844,7 @@ msgid "Have "
 msgstr "Ten "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisíbel"
 
@@ -832,7 +853,7 @@ msgid "Launch a command"
 msgstr "Enviar un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
@@ -955,7 +976,7 @@ msgstr "Última modificación:"
 msgid "New entry received"
 msgstr "Recibiuse unha entrada nova"
 
-#: ../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 "Recibiu unha entrada nova:"
 
@@ -1003,11 +1024,21 @@ msgstr "Insira o contrasinal novo:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Escriba a súa mensaxe nova de estado</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Activo"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Sala:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Mensaxes predefinidas:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Gardar como predefinido..."
 
@@ -1070,11 +1101,11 @@ msgstr "_Engadir á listaxe de contactos"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historial"
 
@@ -1189,7 +1220,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1225,7 +1256,7 @@ msgstr ""
 "Contacto\n"
 "Báner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Negra"
 
@@ -1245,11 +1276,11 @@ msgstr "Personalización de temas do Gajim"
 msgid "Gone"
 msgstr "Marchei"
 
-#: ../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 "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Itálica"
 
@@ -1300,7 +1331,7 @@ msgstr "Cambiar o _tema"
 msgid "Configure _Room..."
 msgstr "Configurar a sala"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Engadir esta sala aos marcadores"
@@ -1335,23 +1366,37 @@ msgstr "_Administrar"
 msgid "_Ban"
 msgstr "_Deshabilitar"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Enviar unha mensaxe privada"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1359,13 +1404,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Asunto"
 
@@ -1391,7 +1436,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Xestor do Historial de Gajim"
 
-#: ../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 "Eliminar"
 
@@ -1416,7 +1462,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Buscar na base de datos"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Historial de conversas"
 
@@ -1437,7 +1483,7 @@ msgstr "Buscar"
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
@@ -1465,8 +1511,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1494,7 +1540,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Amosar o estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1529,33 +1575,51 @@ msgstr "<b>Configuración</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "Conectar con HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Xestionar os perfís do proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Nome:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Contrasinal: "
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Tipo:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Usar a autenticación"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Porto:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
 #, fuzzy
-msgid "_Host:"
-msgstr "_Porto:"
+msgid "Use HTTP prox_y"
+msgstr "_Usar proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Usar a autenticación"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Nome de usuario:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1595,17 +1659,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Enviar"
 
@@ -1712,10 +1781,14 @@ msgstr ""
 "ocupado ou invisíbel."
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1730,20 +1803,20 @@ msgstr ""
 "Usar sempre as aplicacións por defecto do XFCE4\n"
 "Personalizado"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1752,34 +1825,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Amosar os detalles _extra nos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1789,7 +1862,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere que se amosen nas fiestras."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1799,7 +1872,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere enviarlle á outra persoa."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1807,19 +1880,19 @@ msgstr ""
 "O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
 "pantalla cando un contacto se desconectar"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1827,18 +1900,18 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1846,7 +1919,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1854,7 +1927,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
 "debaixo do nome do contacto na listaxe e en grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1862,7 +1935,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1870,7 +1943,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1878,14 +1951,14 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1896,14 +1969,14 @@ msgstr ""
 "Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
 "contacto que non estiver na súa listaxe de contactos."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1912,7 +1985,7 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1922,13 +1995,13 @@ msgstr ""
 "(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
 "estado en liña, ausente, ocupado etc.)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1936,67 +2009,79 @@ msgstr ""
 "Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
 "equivalente en iconas gráficas estáticas ou animadas"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Unha soa fiestra de conversa"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Xestio_nar..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificar a conta"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Notificar de novos correos de _GMail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Información persoal"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Reproducir _sons"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Mostrar o evento na área de notificación"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2004,149 +2089,153 @@ msgstr ""
 "Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
 "isto está marcado, o Gajim amosará a mensaxe en bruto."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Conxunto de _iconas de estado por defecto:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Atascado"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "_Usar as iconas do transporte"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Usar o pre_definido do sistema"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Cando se reciba un acontecemento novo"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Pór _ausente despois de:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonas:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "A_dministrador de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Marcar os erros ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 "_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Mens_axe entrante:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Pór _non dispoñíbel despois de:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Mensaxe saínte:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Restabelecer as cores predeterminadas"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entrar nun grupo de charla"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Non está na listaxe"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutos"
 
@@ -2194,7 +2283,7 @@ msgstr "ID de Jabber:"
 msgid "Order:"
 msgstr "Orde:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
@@ -2264,127 +2353,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Personalizado</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Correo electrónico:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Segundo enderezo:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familia:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personalizado</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Páxina web:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Engadir unha regra</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Personalizado</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Alcume:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Teléfono:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Condicións</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Código postal:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Propiedades</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Configuración</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Configuración</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sons</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Acerca de"
 
@@ -2394,17 +2483,17 @@ msgstr "Prema para definir a súa circunstancia"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Información persoal"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Traballo"
 
@@ -2422,8 +2511,8 @@ msgstr "Eliminar a conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Eliminar"
 
@@ -2448,14 +2537,14 @@ msgstr "Editar os grupos"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Executar o comando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Con_vidar"
 
@@ -2466,7 +2555,7 @@ msgstr "_Eliminar"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Envía XML personalizado"
@@ -2493,12 +2582,6 @@ msgstr "Iniciar a charla"
 msgid "_Allow him/her to see my status"
 msgstr "Permitirlle ver o meu estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirlle ver o meu estado"
@@ -2522,17 +2605,35 @@ msgstr "Renomear"
 msgid "_Subscription"
 msgstr "_Subscrición"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "nove"
 
+#: ../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 "Eliminar"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2560,59 +2661,64 @@ msgid "Profile, A_vatar"
 msgstr "Perfil, Ima_xe"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Amosar os trans_portes"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Contas"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Saír"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Enviar unha _mensaxe..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Ver"
 
@@ -2631,12 +2737,12 @@ msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Buscar"
 
@@ -2726,10 +2832,6 @@ msgstr "Solicitude de subscrición"
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2755,10 +2857,6 @@ msgstr "Enviar mensaxe"
 msgid "Show All Pending _Events"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Amosar _listaxe"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Es_tado"
@@ -2778,55 +2876,60 @@ msgstr "<b>Accións</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Configuración</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Configuración</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Descrición</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Configurar a sala"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Máis"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Imaxe:"
@@ -2839,6 +2942,11 @@ msgstr "<b>Tráfico de Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activar"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2867,13 +2975,13 @@ msgstr "Asignar chave de OpenPGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Editar os grupos"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "Renomear"
 
@@ -2897,30 +3005,26 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Modificar conta"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Información"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2948,7 +3052,7 @@ msgstr "No grupo"
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr ""
 
@@ -2973,230 +3077,267 @@ msgstr "(Ningún)"
 msgid "Hidden"
 msgstr "Oculta"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Recibiu unha entrada nova:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Inglés"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Belarusian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Breton"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "British"
 msgstr "Bretón"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Basque"
 msgstr "Éuscaro"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francés"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croata"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Noruegués b"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Holandés"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Norwegian"
 msgstr "Noruegués"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Portugués do Brasil"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Alemán"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Chinés (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Idioma do corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "A súa mensaxe non se enviará mentres non estiver conectado."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "nove"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Alcume"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Letra:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Información"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifrado activado"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Non está na listaxe"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Listaxe de transferencias activas, rematadas e detidas"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" por %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3204,33 +3345,33 @@ msgstr "Usar a autenticación"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa o texto da fiestra."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3239,66 +3380,66 @@ msgstr ""
 "Uso: /%s <acción>, envíalle unha acción ao grupo de charla actual. Usa a "
 "terceira persoa. (por exemplo /%s berra.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uso: /%s, oculta os botóns de charla."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non hai información de axuda para /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3306,193 +3447,205 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é un ficheiro mais podería ser un directorio"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 pecharase agora"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é un directorio mais podería ser un ficheiro"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "a crear un directorio %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "Información"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre para falar"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "nove"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Non molestar."
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrición do erro..."
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Novo grupo de charla"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s da sala %(room_name)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Xa está na sala %s"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mensaxe sen ler"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e o notificador Daemon para amosar as notificacións"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo en minutos, despois de cambiar a ausente"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por inactividade"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo en minutos, despois de cambiar a non dispoñíbel"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non dispoñíbel por inactividade"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
 # duda sobre collapsed
-#: ../src/common/config.py:111
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Activar a mensaxaría de ligazón local / zeroconf"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Idioma que emprega o corrector"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3502,7 +3655,7 @@ msgstr ""
 "'ás veces' - amosar a hora cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca amosar a hora."
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:109
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3513,18 +3666,18 @@ msgstr ""
 "0 para desactivar o fuzzyclock. 1 é o reloxo máis preciso, 4 o menos "
 "preciso. So se emprega se está conectado print_time 'ás veces'"
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratar os pares de * / _ como posíbeis caracteres de formato."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se é verdadeiro, non elimina */_ . Daquela, *abc* será negra, mais sen "
 "eliminar * *"
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:116
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3534,7 +3687,7 @@ msgstr ""
 "Usa a sintaxe de ReStructured para HTML, mais o formato ascii se está "
 "seleccionado (se quere usalo, instale o docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3542,7 +3695,7 @@ msgstr ""
 "Carácter para engadir despois do alcume cando se usa o completado de alcume "
 "(tab) nos grupos de charla."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3550,26 +3703,26 @@ msgstr ""
 "Carácter para propor para engadir logo do alcume desexado cando alguén está "
 "a empregalo no grupo de conversa."
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Engadir * e [n] no título da listaxe?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3577,11 +3730,11 @@ msgstr ""
 "Cantas liñas quere lembrar da última charla cando se volve abrir un "
 "separador/fiestra de charla"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Cantos minutos debe durar a última liña da conversa anterior."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3589,11 +3742,11 @@ msgstr ""
 "Envíe un mensaxe con Ctrl+Intro e con Intro faise unha liña nova (como o "
 "cliente de Mirabilis ICQ)"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Cantas liñas desexa almacenar para Ctrl+Arriba."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3602,12 +3755,12 @@ msgstr ""
 "URL personalizada con %s onde %s é a palabra/frase ou 'WIKTIONARY' que "
 "significa usar o wiktionary"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se está marcado, o Gajim pode controlarse remotamente ao usar o gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3619,14 +3772,14 @@ msgstr ""
 "posto en Falso e sincronicen co estado global) baseados no estado daconexión "
 "da rede."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Enviáronse as notificacións de estado. Pode ser all, composing_only o "
 "disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3634,7 +3787,7 @@ msgstr ""
 "As notificacións de estado móstranse nas fiestras de conversa. Poden ser "
 "todo, só_compor ou desactivado."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3642,11 +3795,11 @@ msgstr ""
 "Cando non se amosa a hora en cada mensaxe (print_time==sometimes), móstraa "
 "cada x minutos."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Preguntar antes de pechar unha fiestra/separador da sala de charla."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3654,7 +3807,7 @@ msgstr ""
 "Preguntar sempre antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3662,7 +3815,13 @@ msgstr ""
 "Non preguntar nunca antes de pechar a fiestra/separador dun grupo de charla "
 "nesta listaxe (separada por espazos) de ID de Jabber de grupos de charla."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3671,35 +3830,29 @@ msgstr ""
 "Elimínase o host que enviamos para a transferencia dun ficheiro caso de "
 "tradución do enderezo ou o redirección de portos."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Segundo o estándar IEC, KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica acontecementos na área de notificación."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Quere amosar o separador cando só hai unha conversa?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 "Quere amosar o bordo a pestanexar do caderno de notas nas fiestras charla?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Quere amosar o botón de pechar no tabulador?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3707,18 +3860,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Separarase por ';'unha listaxe de palabras que serán resaltadas nos grupos "
 "de charla."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3727,13 +3880,13 @@ msgstr ""
 "fiestras. Esta preferencia só se activa se se usa a icona da área de "
 "notificación. "
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Se é verdadeiro, o Gajim rexistra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3741,7 +3894,7 @@ msgstr ""
 "Se for verdadeiro, o Gajim amosará unha icona en cada separador que conteña "
 "mensaxes sen ler. A depender do tema, esta icona pode ser animada."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3749,11 +3902,11 @@ msgstr ""
 "Se é verdadeiro, o Gajim amosará a mensaxe de estado, se non está baleiro, "
 "para cada contacto baixo o seu nome de contacto na fiestra da listaxe."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3762,7 +3915,7 @@ msgstr ""
 "non tivo unha circunstancia a última vez ou se ten gardada unha demasiada "
 "antiga."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3770,7 +3923,7 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:222
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3785,30 +3938,30 @@ msgstr ""
 "mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
 "saídas no grupo de conversa."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fondo para os contactos que acaban de se conectar."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fondo para os contactos que acaban de se desconectar."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se é verdadeiro, as mensaxes restauradas usarán unha fonte máis pequena que "
 "a predefinida."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3817,7 +3970,7 @@ msgstr ""
 "Se é verdadeiro e as versións instaladas de GTK+ e PyGTK son, cando menos, "
 "2.8, resalta a fiestra cando hai eventos pendentes."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3828,7 +3981,7 @@ msgstr ""
 "envío de información SHA no grupo de charla."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3849,33 +4002,33 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se é falso, non verá máis a circunstancia na fiestra de charla."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Se é verdadeiro, ao premer a tecla escape pecha unha fiestra/separador."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Oculta o báner nunha fiestra de charla de dúas persoas."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Oculta os ocupantes nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3883,17 +4036,17 @@ msgstr ""
 "Nunha charla, amosa o alcume ao comezo nunha soa liña cando non é a mesma "
 "persoa a que enviou a última mensaxe."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3902,13 +4055,13 @@ msgstr ""
 "Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
 "charla."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab conduce ao próximo separador de composición cando ningún está sen "
 "ler."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3916,7 +4069,7 @@ msgstr ""
 "Débese amosar a confirmación da creación de metacontactos ou non? Unha "
 "secuencia baleira significa que nunca se amosará."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -3927,69 +4080,81 @@ msgstr ""
 "fiestra de modificación de conta. TEÑA COIDADO, cando está conectado cunha "
 "prioridade negativa, NON recibirá ningunha mensaxe do seu servidor."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../src/common/config.py:260
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../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."
@@ -3997,60 +4162,68 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4058,119 +4231,125 @@ msgstr ""
 "Se isto está marcado, o Gajim usará o seu IP e proxies que se definen na "
 "opción file_transfer_proxies para a súa transferencia."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingua en que se comprobarán os erros ortográficos"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "estado separado por espazos ou all"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'si', 'non' ou 'ambos'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 "'si', 'non' ou ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4179,148 +4358,178 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Host errado"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A información de rexistro para o transporte %s non chegou a tempo"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Rexistrar %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Fallou a conexión"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "A ID de Jabber non é válida"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcume non permitido: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Non se puido entrar no grupo de charla"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non está na listaxe de membros"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "solicitude de eliminación de subscrición de %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "xa non estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4331,276 +4540,286 @@ msgstr ""
 "http://jru.jabberstudio.org/ para o eliminar"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Non se facilitou a chave de OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Conectarase a %s sen o OpenPGP"
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "O transporte %s respondeu incorrectamente á solicitude de rexistro: %s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Fallou a conexión"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Gardouse en: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Fallou a conexión"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Comprobe a súa conexión ou probe máis tarde"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os "
 "correctos."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Non se pode enviar ficheiros baleiros"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4609,19 +4828,30 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Contactos"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transportes"
 
@@ -4631,11 +4861,11 @@ msgid "Not in roster"
 msgstr "Non está na listaxe"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "As ligazóns D-Bus de python non se achan neste computador"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Non se poden empregar as capacidades D-Bus de Gajim"
 
@@ -4666,1121 +4896,1118 @@ msgstr ""
 "O bus da sesión non está dispoñíbel.\n"
 "Probe a ler http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "doce"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "unha"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dúas"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tres"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "catro"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "cinco"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "seis"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sete"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "oito"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nove"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dez"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "once"
 
+#. 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 "doce"
-
-#. 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
-#, fuzzy
-msgid "$0 o'clock"
-msgstr "$0 en punto"
+msgid "%(0)s o'clock"
+msgstr "%(0)s en punto"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-#, fuzzy
-msgid "five past $0"
-msgstr "$0 e cinco"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s e cinco"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
-msgid "ten past $0"
-msgstr "$0 e dez"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s e dez"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
-msgid "quarter past $0"
-msgstr "$0 e cuarto"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s e cuarto"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-#, fuzzy
-msgid "twenty past $0"
-msgstr "$0 e vinte"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s e vinte"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-#, fuzzy
-msgid "twenty five past $0"
-msgstr "$0 e vinte e cinco"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s e vinte e cinco"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "half past $0"
-msgstr "$0 e media"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s e media"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "twenty five to $1"
-msgstr "$1 menos vinte e cinco"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(1)s menos vinte e cinco"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "twenty to $1"
-msgstr "$1 menos vinte"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "%(1)s menos vinte"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "quarter to $1"
-msgstr "$1 menos cuarto"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "%(1)s menos cuarto"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "ten to $1"
-msgstr "$1 menos dez"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "%(1)s menos dez"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "five to $1"
-msgstr "$1 menos cinco"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "%(1)s menos cinco"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-#, fuzzy
-msgid "$1 o'clock"
-msgstr "$1 en punto"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s en punto"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Madrugada"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Mañá"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Media mañá"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Mediodía"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Serán"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Comezo da semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Metade de semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Final de semana"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "En liñ_a"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "En líña"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "está a escribir..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar a mensaxe"
 msgstr[1] "Enviar a mensaxe"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Conta de Gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "da conta %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausado"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Negra"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Ten "
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Charlas"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Negra"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Contidos"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completado"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Contidos"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Inactivo"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Eliminar"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Desactivado"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Desactivado"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Desactivado"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr ""
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "mensaxe"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisíbel"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "unha"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr ""
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Alemán"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Desconectado"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "once"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Atascado"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Última modificación:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Alcume"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "A durmir"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Rúa:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Engadiuse"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Hora"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "nove"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host errado"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Serán"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "A compor"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Mañá"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "todos no grupo"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Serán"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "A expulsar %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cambiando o asunto"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "A expulsar %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "A expulsar %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Desconectar"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "A durmir"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver un filme."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "A compor"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "_Abrir como ligazón"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "A compor"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "A traballar"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Non se pode conectar ao porto %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -5790,20 +6017,13 @@ msgstr ""
 "cancelarase."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Non foi posíbel estabelecer a conexión ao host: expirou cando enviaba a "
-"información."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5812,15 +6032,15 @@ msgstr ""
 "O host que configurou como a opción avanzada ft_override_host_to_send non é "
 "valido e ignorarase."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Para continuar a enviar e recibir mensaxes, precisa volver conectarse."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5829,32 +6049,32 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Por favor, comprobe se o Avahi está instalado."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Non foi posíbel cambiar o estado da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5863,63 +6083,53 @@ msgstr ""
 "enviar "
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contacto está desconectado. A súa mensaxe non se puido enviar."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Non foi posíbel estabelecer a conexión ao host: expirou cando enviaba a "
+"información."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Desactivado"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Activo"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Acontecemento"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Personalizado</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5928,109 +6138,72 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Recibiuse a primeira mensaxe"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Recibiuse unha mensaxe nova"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Recibiuse unha mensaxe nova"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Nome de contacto"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Contacto desconectado"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Enviouse a mensaxe"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Remarcado da mensaxe de grupo de charla"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Recibiuse unha mensaxe de grupo de charla"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Recibiuse un correo de GMail"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Nome"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Quere reconectarse agora?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se quere que se apliquen todos os cambios instantaneamente, debe "
 "reconectarse."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as charlas e os grupos de charlas pecharanse. Desexa continuar?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Para cambiar o nome da conta, debe ler o resto de\n"
 "acontecementos pendentes"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6038,147 +6211,142 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "A ID de Jabber non é válida"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Unha ID de Jabber debe estar na forma \"usuario@nomeservidor\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houbo un problema ao recuperar as súas chaves secretas de OpenPGP"
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Debe crear unha conta antes de editar a súa información persoal"
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Non está conectado ao servidor"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sen unha conexión, non pode editar a súa información persoal"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "O seu servidor non pode gardar a súa información persoal."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor, volva darlle nome ou elimíneo antes de habilitar a mensaxaría de "
 "ligazón local."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6186,11 +6354,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6198,11 +6366,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6211,11 +6379,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6223,14 +6391,15 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Pode ser un dos seguintes:\n"
 "1. usuario@dominio/recurso (só ese recurso coincide)2. usuario@dominio "
@@ -6239,86 +6408,93 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, asegúrese de cubrir os campos de servidor e de sala ou elimine "
 "este marcador."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Debe pórlle un nome para configurar esta conta."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "ID de Jabber duplicada"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Esta conta xa está configurada no Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "A entrada non é válida"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6328,27 +6504,34 @@ msgstr ""
 "Pode configurar opcións avanzadas da conta se preme o botón Avanzado, ou "
 "máis tarde mediante o submenú Contas do menú Editar da fiestra principal."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "A súa conta nova creouse con éxito"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Debe pórlle un nome para configurar esta conta."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6358,7 +6541,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6366,31 +6549,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "A súa conta nova creouse con éxito"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Activo"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Acontecemento"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Recibiuse a primeira mensaxe"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Recibiuse unha mensaxe nova"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Recibiuse unha mensaxe nova"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Nome de contacto"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Contacto desconectado"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Enviouse a mensaxe"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Remarcado da mensaxe de grupo de charla"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Recibiuse unha mensaxe de grupo de charla"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Recibiuse un correo de GMail"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6399,75 +6624,75 @@ msgstr ""
 "O texto que está debaixo desta liña foi o que se dixo desde a última vez que "
 "lle prestou atención a esta sala de charla"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Saír"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" no URL do dicionario e non está no WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Onte"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "hai %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de MI de Jabber"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6482,42 +6707,42 @@ msgstr "Nome do contacto : <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID de Jabber : <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "No grupo"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Chave ID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nome de contacto"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir a MDD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaxe de estado %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensaxe de estado"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6525,107 +6750,107 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Gardar como mensaxe de estado predefinido"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Escriba un nome para esta mensaxe de estado"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Enderezo de AIM:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Enderezo de MSN:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Enderezo de Yahoo!:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduza a información do contacto que quere engadir á conta %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, cubra a información do contacto que quere engadir"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Por último mais non menos importante, queremos agradecerlles a todos os "
 "mantedores de paquetes."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6636,95 +6861,95 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr ""
+"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitude de subscrición para a conta %s de %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr ""
-"A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non pode entrar nunha sala de charla até que non se conecte."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
@@ -6733,276 +6958,302 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Os contrasinais escritos nos dous campos deben ser idénticos."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Mensaxe nova"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Mensaxe nova"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Mensaxe privada nova"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Estou %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:2568
+#. 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 "Gustaríame engadilo á miña listaxe de contactos."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Enderezo"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Modificar"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "ID de Jabber:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupo"
+
+#. 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 "Gustaríame engadilo á miña listaxe de contactos"
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Orde: %s, acción: %s, tipo: %s, valor: %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Debe introducir un nome para crear unha listaxe de privacidade."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s convidouno ao grupo de charla %(room_jid)s."
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "núm."
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "cando estea "
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7010,38 +7261,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7051,58 +7302,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Sen unha conexión non pode navegar polos servizos dispoñíbeis"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7110,317 +7361,341 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de servizo non contén ningún elemento para navegar."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "Executar o _comando..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "O marcador xa se definiu"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "A sala \"%s\" xa está nos seus marcadores."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "O marcador engadiuse con éxito"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Comandos: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "Historial"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Os contrasinais non coinciden"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Modificar a conta"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "_Adaptar ao estado"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Cifrado OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "Mens_axe entrante:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Xeral"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Características dos servidores"
@@ -7450,7 +7725,7 @@ msgstr "Tamaño: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Vostede"
 
@@ -7460,7 +7735,7 @@ msgid "Sender: %s"
 msgstr "Remitente: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -7494,27 +7769,27 @@ msgstr "Mensaxe de erro: %s"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "O contacto detivo a transferencia do ficheiro"
+msgid "File transfer stopped"
+msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Elixa un ficheiro para enviar..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "O Gajim non pode acceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Outro proceso está a usar este ficheiro."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
@@ -7534,34 +7809,34 @@ msgstr "Descrición: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quere enviarlle un ficheiro:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non se pode sobrescribir o ficheiro existente \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr ""
 "Xa existe un ficheiro con este nome e non ten permiso para o sobreescribir"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Que quere facer?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Non se pode escribir no directorio \"%s\""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
@@ -7597,53 +7872,53 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "O Gajim precisa un GTK 2.6 ou superior"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "A biblioteca GTK+ precisa un soporte de libglade"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7652,22 +7927,22 @@ msgstr ""
 "Por favor, elimine a súa biblioteca GTK+ actual e instale a última versión "
 "estábel desde %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor, asegúrese de que GTK+ e PyGTK teñen un soporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "O Gajim precisa un PySQLite2 para funcionar"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa un pywin32 para funcionar"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7677,11 +7952,11 @@ msgstr ""
 "obtelo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "O Gajim xa está a se executar"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7689,25 +7964,34 @@ msgstr ""
 "Outra instancia dO Gajim semella estar xa en execución\n"
 "Quere executar unha outra?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Conectarase a %s sen o OpenPGP"
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7718,147 +8002,183 @@ msgstr ""
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: ../src/gajim.py:571
+#: ../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 "Acepta esta solicitude?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Solicitude de subscrición"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizouno para ver o seu estado."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Eliminar"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s coñéceselle como %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 está agora %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necesario un contrasinal para entrar a este grupo de charla."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "_Non me preguntar outra vez"
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Ten %d nova conversa de correo"
 msgstr[1] "Ten %d novas conversas de correo"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7868,82 +8188,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina o contacto da listaxe"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro ao ler o ficheiro:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recibiu con éxito o ficheiro %(ficheiro)s de %(nome)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Detívose a transferencia do ficheiro %(ficheiro)s de %(nome)s."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Envioulle con éxito o ficheiro %(filename)s a %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Detívose a transferencia de %(filename)s a %(name)s."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Por favor, escriba un nome de usuario novo para a súa conta local"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7951,131 +8281,108 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Conexión"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "_Non me preguntar outra vez"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non pode entrar nun grupo de charlas se está invisíbel"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "O marcador xa se definiu"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "A sala \"%s\" xa está nos seus marcadores."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "O marcador engadiuse con éxito"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Pode xestionar os seus marcadores mediante o menú Accións da súa listaxe"
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Amosa axuda sobre un comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "amosar axuda sobre un comando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Amosa unha fiestra emerxente co seguinte acontecemento pendente"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8084,49 +8391,50 @@ msgstr ""
 "Amosa unha listaxe de todos os contactos na listaxe. Cada contacto aparece "
 "nunha liña distinta"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "amosar só contactos da conta especificada"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Amosa unha listaxe de contas que están rexistradas"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Cambia o estado dunha ou de varias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "mensaxe"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "mensaxe de estado"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8135,19 +8443,23 @@ msgstr ""
 "o estado de todas as contas que teñen a opción \"sync with global status\" "
 "activada"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Amosa o diálogo de charla para enviarlle mensaxes a un contacto"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se se especifica, o contacto obtense da listaxe desta conta"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8157,29 +8469,29 @@ msgstr ""
 "OpenPGP como a conta son opcionais. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se se especifica, a mensaxe cifrarase mediante a súa chave pública"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se se especifica, a mensaxe enviarase a través desta conta"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8189,140 +8501,140 @@ msgstr ""
 "OpenPGP como a conta son optativas. Se quere definir só 'conta' sen 'chave "
 "pgp', só defina 'chave pgp' a ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "tema da mensaxe"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do contacto que recibirá a mensaxe"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Obter información detallada dun contacto"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Obter información detallada dunha conta"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Nome da conta"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Enviarlle un ficheiro a un contacto"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "ficheiro"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Camiño do ficheiro"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se se especifica, o ficheiro enviarase mediante esta conta"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Nomea todas as preferencias e os seus valores"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'entrada' a 'valor'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "entrada=valor"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "a 'entrada' é o nome da preferencia, o 'valor' é o do valor para definir"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Elimina un elemento de preferencia"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "entrada"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome da preferencia para eliminar"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escribe o estado actual da preferencias do Gajim para o ficheiro de "
 "configuración"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Engade o contacto á listaxe"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Engade un contacto novo a esta conta."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Devolve o estado actual (o global se non se especificar unha conta)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Devolve a mensaxe de estado actual (o global se non se especificar unha "
 "conta)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Devolve o número de mensaxes sen ler"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Abre o diálogo de iniciar charla"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Iniciar unha charla con esta conta"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Envía XML personalizado"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML para enviar"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8330,75 +8642,80 @@ msgstr ""
 "Conta a que se lle enviará; se non se especificar nada, o xml enviaráselles "
 "a todas as contas"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "contido da mensaxe"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr ""
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "Alcume"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "password"
 msgstr "Contrasinal: "
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8407,31 +8724,31 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8440,7 +8757,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8449,7 +8766,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8458,7 +8775,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host errado"
@@ -8477,178 +8794,181 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Non pode eliminar o tema actual"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Quer xa non está no grupo de charla \"%s\" quer \"%s\" esta xa non existe."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulsado por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "O nome de usuario non é válido"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Este grupo de charla non ten un asunto"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s convidouse a %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Non se achou o alcume: %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 ""
 "Uso: /%s <alcume|JID> [motivo], expulsa o JID do grupo de charla. O alcume "
 "dun ocupante pode ser substituído, mais non se contén \"@\". Se o JID está "
 "actualmente no grupo de charla, el/ela será tamén expulsado. NON se admiten "
 "espazos no alcume."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8656,7 +8976,7 @@ msgid ""
 msgstr ""
 "Uso: /%s <alcume>, abre unha fiestra de charla co ocupante especificado."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8665,7 +8985,7 @@ msgstr ""
 "Uso: /%s [motivo], pecha a fiestra ou o separador actual e amosa o motivo se "
 "se especificar."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8674,7 +8994,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], convida o JID ao grupo de charla actual, e "
 "opcionalmente especifica un motivo."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8683,18 +9003,17 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcume], ofrece a entrada a sala@servidor e usa "
 "opcionalmente o alcume especificado"
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Uso: /%s <alcume> [motivo], elimina da sala o ocupante que especificao "
 "alcume e opcionalmente especifica un motivo. NON se admiten espazos no "
 "alcume."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8703,81 +9022,95 @@ msgstr ""
 "Uso: /%s <alcume> [message], abre unha fiestra de charla privada e envíalle "
 "unha mensaxe ao ocupante que especifica o alcume."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s , amosa os nomes dos ocupantes do grupo de charla."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tema], amosa ou actualiza o asunto actual da sala."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uso: /%s <mensaxe>, envía unha mensaxe sen buscar outros comandos."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Uso: /%s <alcume>, cambia o seu alcume na sala actual."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se pecha esta fiestra, desconectaráselle deste grupo de charla."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
@@ -8807,77 +9140,77 @@ msgstr "Detalles"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Erro ao analizar o ficheiro:"
 
 #. 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 ""
 "Non se pode escribir en %s. O soporte de manexo de sesión non funcionará"
 
 #. 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 ""
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../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 ""
 "A imaxe non se puido gardar no formato %(type)s. Desexa gardar como %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Non se pode achar a base de datos do historial"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contactos"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Alcume"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8885,7 +9218,7 @@ msgstr ""
 "Quere limpar a base de datos? (TOTALMENTE DESACONSELLADO SE GAJIM ESTÁ EN "
 "EXECUCIÓN)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8899,16 +9232,16 @@ msgstr ""
 "\n"
 "Caso de elixir SI, por favor, agarde..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "A exportar o historial..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s - %(time)s dixo: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] ""
@@ -8916,160 +9249,170 @@ msgstr[0] ""
 msgstr[1] ""
 "Está seguro de que quere eliminar o historial dos contactos que seleccionou?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Esta é unha operación irreversíbel"
 
-#: ../src/history_manager.py:585
+#: ../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] "Está seguro de que quere eliminar a mensaxe que seleccionou?"
 msgstr[1] "Está seguro de que quere eliminar as mensaxes que seleccionou?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Historial de conversas con %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s "
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Non está conectado ao servidor"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Está seguro de que quere eliminar a mensaxe que seleccionou?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Mensaxes"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensaxe privada desde o grupo de charlas %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Xeral"
+msgid "Ignore"
+msgstr "nove"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Información recibida"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sen unha conexión non pode publicar a súa información de contacto."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "A enviar o perfil..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Información NON publicada"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Fallou a publicación da vCard"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9077,52 +9420,46 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" acepta esta solicitude, poderá saber o seu estado."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar nun ou máis grupos de charlas"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9130,15 +9467,28 @@ msgstr ""
 "Ao cambiar o seu estado a invisíbel provocará a súa desconexión dos grupos "
 "de charla. Está seguro de que quere ser invisíbel?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Está seguro de que quere abandonar a sala \"%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 "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9147,16 +9497,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9164,11 +9514,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9178,52 +9528,57 @@ msgstr ""
 "%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Quere eliminar o grupo %s da listaxe?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Eliminar da listaxe tamén todos os contactos dentro do grupo"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9232,12 +9587,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9245,16 +9600,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto coñeza o meu estado despois da eliminación"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9264,19 +9619,19 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Debe crear unha conta antes de poder conversar con outros contactos."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9285,12 +9640,12 @@ msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
 
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3902
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9301,149 +9656,150 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s quere enviarlle un ficheiro:"
 msgstr[1] "%s quere enviarlle un ficheiro:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Facer %s e %s metacontactos"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "a usar a conta %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Activo"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Novo grupo de charla"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
@@ -9460,20 +9816,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Asunto: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9483,7 +9839,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9493,129 +9849,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../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 deste grupo de charla"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Subscrición: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Sala:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Activo"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Detido"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servizo non respondeu aínda con información detallada"
 
-#: ../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"
@@ -9631,17 +9977,22 @@ msgstr "Descoñecido"
 msgid "?OS:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Descoñecido"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programas</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9649,7 +10000,7 @@ msgstr ""
 "Este contacto está interesado na información da súa presenza, mais vostede "
 "non o está na súa"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9657,14 +10008,14 @@ msgstr ""
 "Está interesado na información da presenza do contacto, mais el/ela non o "
 "está en vostede"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto vostede como o contacto están interesados na información da presenza "
 "do outro"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9672,21 +10023,82 @@ msgstr ""
 "Non está interesado na presenza do contacto e el/ela tampouco o está en "
 "vostede"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Está a agardar a resposta do contacto sobre a súa solicitude de subscrición"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Cifrado OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Prema para ver as características (como transportes de MSN e ICQ) dos "
+#~ "servidores de Jabber"
+
+#~ msgid "Servers Features"
+#~ msgstr "Características dos servidores"
+
+#~ msgid "Your JID:"
+#~ msgstr "O seu identificador JID"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#, fuzzy
+#~ msgid "_Host:"
+#~ msgstr "_Porto:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Amosar _listaxe"
+
+#~ msgid "Modify Account"
+#~ msgstr "Modificar conta"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" por %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Conta de Gajim %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Personalizado</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "ID de Jabber duplicada"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Esta conta xa está configurada no Gajim."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "O contacto detivo a transferencia do ficheiro"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Xeral"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Activo"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s non difundiu a súa chave de OpenPGP nin vostede lle asignou unha"
@@ -9714,9 +10126,6 @@ msgstr " recurso con prioridade "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Introduza, mais unha vez, o contrasinal:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Usar proxy"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9904,9 +10313,6 @@ msgstr " recurso con prioridade "
 #~ msgid "_Before time:"
 #~ msgstr "_Antes da hora:"
 
-#~ msgid "_Font:"
-#~ msgstr "_Letra:"
-
 #~ msgid "_Never"
 #~ msgstr "_Nunca"
 
@@ -9919,12 +10325,6 @@ msgstr " recurso con prioridade "
 #~ msgid "_Pop it up"
 #~ msgstr "_Emerxer"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL"
-
-#~ msgid "Address"
-#~ msgstr "Enderezo"
-
 #~ msgid "City:"
 #~ msgstr "Cidade:"
 
@@ -10064,9 +10464,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Deixar %s no grupo %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Facer %s e %s metacontactos"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Oculta os botóns nas fiestras de charla de dúas persoas."
 
@@ -10094,9 +10491,6 @@ msgstr " recurso con prioridade "
 #~ msgstr[0] "%d mensaxe privada sen ler"
 #~ msgstr[1] "%d mensaxes privadas sen ler"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr ""
diff --git a/po/hr.po b/po/hr.po
index dd45a4a97..6abd3e4aa 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-10 09:19+0100\n"
-"PO-Revision-Date: 2008-12-09 23:36+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:52+0200\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid "_Add Contact..."
 msgstr "_Dodaj Kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Otkrivanje Usluga"
 
@@ -63,7 +63,7 @@ msgid "_Personal Events"
 msgstr "_Osobni Događaji"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Novi Razgovor..."
 
@@ -95,6 +95,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Molim odaberite poslužitelj</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"
@@ -102,61 +106,54 @@ msgstr ""
 "Dodaj ovaj certifikat na listu povjerljivih certifikata.\n"
 "SHA1 potpis certifikata:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Kliknite da bi vidjeli mogućnosti (kao što su MSN, ICQ transporti) jabber "
-"poslužitelja"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Koristi autentifikaciju"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Spoji se kada pritisnem Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Čarobnjak za Stvaranje Računa"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Već imam račun koji želim _koristiti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Želim se _registrirati novi račun"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj račun"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Uredi..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Snimi lo_zinku"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Mogućnosti Poslužitelja"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri spajanju"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Koristi vlastito ime poslužitelja/port"
 
@@ -169,25 +166,27 @@ msgstr ""
 "na Jabber mrežu."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Vaš JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Ime poslužitelja:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Lozinka:"
 
@@ -199,11 +198,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:16
-msgid "_Username:"
-msgstr "_Korisničko ime:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -212,18 +206,16 @@ msgstr "<b>Ostalo</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobne informacije</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Korisnički račun"
 
@@ -232,23 +224,22 @@ msgid "Account Modification"
 msgstr "Modifikacija Korisničkog Računa"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administratorski postupci"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatsko ponovno spajanje kada je veza izgubljena"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "P_romijeni Lozinku"
 
@@ -265,37 +256,35 @@ msgstr ""
 "biti onemogućen"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Odaberi _Ključ"
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Kliknite za promjenu lozinke korisničkog računa"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Kliknite da zatražite autorizaciju svih kontakata drugog računa"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Veza"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Izmjeni Osobne Informacije"
 
 #. 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:1034
-#: ../src/common/helpers.py:1046 ../src/notify.py:515 ../src/notify.py:546
-#: ../src/notify.py:558
+#: ../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"
 
@@ -303,17 +292,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2654
-#: ../src/roster_window.py:5137
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Općenito"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Ime poslužitelja:"
 
@@ -336,7 +322,6 @@ msgstr ""
 "konekciju i spriječio prekid veze."
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -346,7 +331,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -356,7 +340,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -371,9 +354,8 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacije o vama, kako stoji na poslužitelju"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1611
-#: ../src/config.py:2111
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
@@ -383,35 +365,34 @@ msgstr "Niti jedan ključ nije odabran"
 #. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1162
-#: ../src/config.py:1251 ../src/config.py:1519 ../src/config.py:1524
-#: ../src/config.py:2019 ../src/config.py:2097 ../src/config.py:2110
-#: ../src/config.py:3201 ../src/config.py:3269 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2723
-#: ../src/roster_window.py:2729 ../src/roster_window.py:2734
+#: ../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 "Ništa"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Osobne Informacije"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../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:42
+#: ../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 "
@@ -422,7 +403,7 @@ msgstr ""
 "račun; klijent sa najvišim prioritetom dobiva te događaje"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promijenjen prema vašem statusu."
 
@@ -431,12 +412,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../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:46
+#: ../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 "
@@ -450,30 +431,25 @@ msgstr ""
 "najvišim prioritetom dobivat će obavijesti o događajima"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Snimi _lozinku (nesigurno)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Spremaj _povijest razgovora za sve kontakte"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Šalji keep-alive pakete"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_roniziraj status računa sa globalnim statusom"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Sinkroniziraj kontakte"
@@ -483,21 +459,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Koristi _SSL (zastarjelo)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Koristi proxy za prijenos datoteka"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Uredi prema statusu"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Ime:"
 
@@ -505,11 +476,21 @@ msgstr "_Ime:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Uredi prema statusu"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Korisnički Račun"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Koristi autentifikaciju"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -517,21 +498,18 @@ msgstr ""
 "Označite ovo kako bi vas Gajim obavijestio prije slanja vaše lozinke preko "
 "nesigurne veze."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Sp_oji se prilikom pokretanja Gajima"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Omogući"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Ime:"
 
@@ -540,7 +518,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Ako je označeno, Gajim će preuzeti lozinku od GPG agenta kao seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -551,56 +528,98 @@ msgstr ""
 "Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Prezime:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Spoji račune"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5088
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Šalji keep-alive pakete"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sink_roniziraj status računa sa globalnim statusom"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Koristi GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Koristi vlastito ime poslužitelja/port"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Koristi vlastiti port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Izmjeni Osobne Informacije"
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Omogući"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Ime poslužitelja:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Uredi..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Upozori prije korištenja nesigurne veze"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "koristi HTTP_PROXY varijablu okruženja"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "koristi HTTP_PROXY varijablu okruženja"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Račun:"
@@ -786,7 +805,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:290
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Odsutan"
 
@@ -803,7 +822,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -812,7 +831,7 @@ msgid "Launch a command"
 msgstr "Pokrenite naredbu"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -933,7 +952,7 @@ msgstr "Posljednja izmjena:"
 msgid "New entry received"
 msgstr "Primljen novi unos"
 
-#: ../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 "Primili ste novi unos:"
 
@@ -977,11 +996,19 @@ msgstr "Unesite novu lozinku:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Upišite vašu novu statusnu poruku</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 "Aktivnost:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Raspoloženje:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Predefinirane poruke:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Spremi kao Predefiniranu..."
 
@@ -1041,11 +1068,11 @@ msgstr "_Dodaj na Listu"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Povijest razgovora"
 
@@ -1190,7 +1217,7 @@ msgstr ""
 "Red Kontakt\n"
 "Baner Razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:743
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1210,11 +1237,11 @@ msgstr "Personalizacija Gajim Tema"
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../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 "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:744
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Ukošeno"
 
@@ -1262,7 +1289,7 @@ msgstr "Promijeni _Temu..."
 msgid "Configure _Room..."
 msgstr "Podešavanje _Sobe..."
 
-#: ../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 "_Postavi Oznaku"
 
@@ -1294,23 +1321,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../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 "_Blokiraj"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Član"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Vlasnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Pošalji Privatnu Poruku"
 
-#: ../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 "_Odblokiraj"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Glas"
 
@@ -1318,13 +1359,13 @@ msgstr "_Glas"
 msgid "Create new post"
 msgstr "Stvorite novi dopis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:315
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tema"
 
@@ -1343,7 +1384,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajim Upravitelj Zapisima</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 "Obriši"
 
@@ -1397,7 +1439,7 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
-#: ../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 "Pridružiti se Grupnom Razgovoru"
 
@@ -1424,8 +1466,8 @@ msgstr "Nedavno:"
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Pridruživanje"
 
@@ -1454,7 +1496,7 @@ msgstr "Minimiziraj kod Automatskog Ulaska"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Poslužitelj:"
 
@@ -1484,11 +1526,6 @@ msgstr "<b>Postavke</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
 #, fuzzy
-msgid "B_OSH Port:"
-msgstr "_Port:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1497,47 +1534,48 @@ msgstr ""
 "HTTP Spoj\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje Proxy Profila"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Name:"
-msgstr "Ime:"
-
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Lo_zinka:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:8
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:9
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:10
 #, fuzzy
-msgid "Use HTTP proxy"
+msgid "Use HTTP prox_y"
 msgstr "_Koristi proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/glade/manage_proxies_window.glade.h:11
 #, fuzzy
-msgid "Use proxy authentication"
+msgid "Use proxy auth_entication"
 msgstr "Koristi autentifikaciju"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL:"
 
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Vrsta:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Korisničko ime:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Dodaj kontakt na listu (Ctrl+D)"
@@ -1586,7 +1624,7 @@ msgstr "Prikaži profil kontakta (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 "_Pošalji"
 
@@ -1682,10 +1720,14 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Dozvoli obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Zatraži statusnu poruku kada se:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1699,19 +1741,19 @@ msgstr ""
 "Uvijek koristi predefinirane Xfce aplikacije\n"
 "Osobno prilagođeno"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Poruka:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Pri pokretanju provjeri ako je Gajim _zadani Jabber klijent"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Postavi boje i font sučelja"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1725,31 +1767,31 @@ msgstr ""
 "Odvojena lista sa razgovorima grupiranim po računu\n"
 "Odvojena lista sa razgovorima grupiranim po vrsti"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži _aktivnost kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne email _detalje"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _glazbu kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži a_vatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženje kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1759,7 +1801,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1769,7 +1811,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
 "drugoj osobi."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1777,11 +1819,11 @@ msgstr ""
 "Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa malim "
 "prozorom u donjem desnom kutu ekrana"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij dugmad u prozoru razgovora."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1789,21 +1831,21 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Odsutan kad se računalo ne "
 "koristi."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1811,7 +1853,7 @@ msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
 "koristi još duže."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1819,7 +1861,7 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1827,23 +1869,23 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati aktivnost kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ako je označeno, Gajim će prikazivati glazbu koju slušaju kontakti na listi"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1854,7 +1896,7 @@ msgstr ""
 "desnim klikom miša na polje za unos teksta, zadani jezik će se koristiti za "
 "dani kontakt ili grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1864,7 +1906,7 @@ msgstr ""
 "vaše liste. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi "
 "van vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1874,7 +1916,7 @@ msgstr ""
 "da se kod E2E enkripcije druga strana mora složiti s time, inače poruke neće "
 "biti zapisane."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1882,7 +1924,7 @@ msgstr ""
 "Ako je označeno, Gajim će obavještavati o novim e-mail porukama primljenim "
 "preko GMail"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1891,7 +1933,7 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn statusne ikone)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1899,7 +1941,7 @@ msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1907,43 +1949,50 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Spremaj _kriptirane razgovore"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Na_pravi prozore sa razgovorom kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Izmje_ni..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Obavijesti"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavijesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavijesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Obavijesti o novoj _Gmail e-pošti"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Osobni Događaji"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Dozvoli _zvukove"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1953,19 +2002,24 @@ msgstr ""
 "Obavijesti me o njima\n"
 "Prikaži samo na listi korisnika"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Prikaži događaj u traci radne površine"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Prijavim"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Odjavim"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1973,139 +2027,145 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
 "označeno, Gajim će prikazati samo čisti tekst poruke."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Statusne _ikone:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Izgled"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Statusna poruka kod automatske odsutnosti. Ukoliko je prazno Gajim neće "
 "promjeniti trenutnu statusnu poruku"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Statusna poruka kod automatske nedostupnosti. Ukoliko je prazno Gajim neće "
 "promjeniti trenutnu statusnu poruku"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Različite _ikone za prijenose"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Definirano _sustavom"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Kod novih događaja:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "_Odsutan automatski nakon:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Preglednik:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Prikaži obavijesti o statusu razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Emotikoni:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Upravitelj datotekama:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Istakni pogrešno napisane riječi"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriraj bogati sadržaj u dolaznim porukama"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Dolazna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Mail klijent:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "_Nedostupan automatski nakon:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Odlazna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Vrati predefinirane boje"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "_Šalji obavijesti o statusu razgovora"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_URL isticanje:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Ponašanje Prozora"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "na _listi"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minuta"
 
@@ -2153,7 +2213,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
@@ -2218,108 +2278,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Tvrtka:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Zemlja:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Odjel:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-Mail:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Dodatna Adresa:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Prezime:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno Ime</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Djevojačko:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Osobna Stranica:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Srednje:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Ime:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Nadimak:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Broj Telefona:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Pozicija:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Poštanski broj:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Uloga:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Država:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Ulica:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Dodatak:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "O meni"
 
@@ -2329,17 +2389,17 @@ msgstr "Kliknite za postavljanje avatara"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Osobne Informacije"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Posao"
 
@@ -2357,8 +2417,8 @@ msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5125
-#: ../src/roster_window.py:5603 ../src/roster_window.py:5732
+#: ../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 "_Ukloni"
 
@@ -2380,14 +2440,14 @@ msgstr "Uredi _Grupe..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5675
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Izvrši Naredbu..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5556
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
@@ -2397,7 +2457,7 @@ msgstr "Uklo_ni"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5053 ../src/roster_window.py:5641
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Postavi Prila_gođeni Status"
 
@@ -2422,12 +2482,6 @@ msgstr "Započni _Razgovor"
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli njemu/njoj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5116 ../src/roster_window.py:5593
-#: ../src/roster_window.py:5722
-msgid "_Block"
-msgstr "_Blokiraj"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
@@ -2449,16 +2503,34 @@ msgstr "_Preimenuj..."
 msgid "_Subscription"
 msgstr "_Pretplata"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5587
-#: ../src/roster_window.py:5719
-msgid "_Unblock"
-msgstr "_Odblokiraj"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Prestani Ignorirati"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Dodaj _Kontakt..."
@@ -2484,56 +2556,62 @@ msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Prikaži _Odspojene Kontakte"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Prikaži _Prijenose"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
-msgstr "Prikaži _listu kontakata"
-
 #: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Prikaži _Listu Kontakata"
+
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Korisnički Računi"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_Česta pitanja"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "_Slanje Jedne Poruke..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Prikaz"
 
@@ -2550,11 +2628,11 @@ msgid "_Add contact"
 msgstr "_Dodaj kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5744
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Informacije"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Pretraga"
 
@@ -2640,10 +2718,6 @@ msgstr "Zahtjev za Pretplatom"
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Označite račun za sinkronizaciju"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Označite račun sa kojim želite sinkronizirati"
@@ -2668,10 +2742,6 @@ msgstr "Pošalji Jednu _Poruku"
 msgid "Show All Pending _Events"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Prikaži _Listu Kontakata"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2689,49 +2759,54 @@ msgstr "<b>Pitaj:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Klijent:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Država:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Pretplata:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sustav:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Komentar"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Podešeni avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Informacije Kontakta"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Više"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Korisnički Avatar:"
 
@@ -2743,6 +2818,11 @@ msgstr "<b>Jabber Promet</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Unos</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Omogući"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2771,13 +2851,13 @@ msgstr "Pridruži Open_PGP Ključ"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Izmjeni _Grupe"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Preimenuj"
 
@@ -2801,29 +2881,25 @@ msgstr "Resurs"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Izmjeni Račun"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Otkaži potvrdu"
 
-#: ../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 "Izvršavanje naredbe u tijeku. Zaista želite odustati?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Servis je promjenio identifikator sesije."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Servis je poslao neispravne podatke"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Servis je promjenio identifikator sesije."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Servis je odgovorio sa greškom."
 
@@ -2848,7 +2924,7 @@ msgstr "Cijeli broj"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:763
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Boja"
 
@@ -2873,175 +2949,198 @@ msgstr "(Nema)"
 msgid "Hidden"
 msgstr "Skrivena"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Primili ste novi unos:"
+
 #. 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 "Engleski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Bjeloruski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretonski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Njemački"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Britanski"
 
-#: ../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 "Španjolski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Talijanski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazilski Portugalski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
 
 #. we are not connected
-#: ../src/chat_control.py:358 ../src/chat_control.py:546
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:359 ../src/chat_control.py:547
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslana dok niste spojeni."
 
-#: ../src/chat_control.py:745
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Neodređen"
 
-#: ../src/chat_control.py:746
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Bolestan"
 
-#: ../src/chat_control.py:769
+#: ../src/chat_control.py:796
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informacije Kontakta"
 
-#: ../src/chat_control.py:1209 ../src/chat_control.py:1611
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Zaista pošalji datoteku?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1238 ../src/chat_control.py:2105
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:72
-#: ../src/common/helpers.py:302 ../src/conversation_textview.py:860
-#: ../src/dialogs.py:903 ../src/gajim.py:983 ../src/gajim.py:1643
-#: ../src/normal_control.py:483 ../src/roster_window.py:911
-#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1870 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3115 ../src/roster_window.py:5237
-#: ../src/roster_window.py:5422
+#: ../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 "Nije na Listi Kontakata"
 
-#: ../src/chat_control.py:1370 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
+
+#: ../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 "Nepoznat Izvođač"
 
-#: ../src/chat_control.py:1372 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Nepoznat Naslov"
 
-#: ../src/chat_control.py:1374 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Nepoznat Izvor"
 
-#: ../src/chat_control.py:1378 ../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"
@@ -3050,26 +3149,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "šalje <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1383
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s od %(artist)s\n"
-"šalje %(source)s"
-
-#: ../src/chat_control.py:1506
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s iz grupnog razgovora %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1591 ../src/dialogs.py:3907
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/chat_control.py:1592
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3077,50 +3167,50 @@ msgstr ""
 "Niti jedan GPG ključ nije dodjeljen ovom kontaktu. Nije moguće kriptirati "
 "poruke sa GPG."
 
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1626
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti sačuvana"
 
-#: ../src/chat_control.py:1628
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti sačuvana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1642
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1648
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "i autentičan"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1652
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "i NIJE autentičan"
 
 #. 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:1658
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3129,26 +3219,26 @@ msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: ../src/chat_control.py:1706
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Naredba nije podržana za zeroconf račun."
 
-#: ../src/chat_control.py:1717 ../src/groupchat_control.py:1651
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
 
-#: ../src/chat_control.py:1720 ../src/groupchat_control.py:1665
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uporaba: /%s, prazni tekstualni prozor"
 
-#: ../src/chat_control.py:1723 ../src/groupchat_control.py:1670
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uporaba: /%s, sakriva dugmadi."
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1686
+#: ../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 "
@@ -3157,63 +3247,63 @@ msgstr ""
 "Uporaba: /%(command)s <action>, šalje akciju trenutnom grupnom razgovoru. "
 "Koristi treću osobu. (npr. /%(command)s eksplodira.)"
 
-#: ../src/chat_control.py:1731
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uporaba: /%s, šalje ping kontaktu"
 
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uporaba: /%s, šalje poruku kontaktu"
 
-#: ../src/chat_control.py:1737 ../src/groupchat_control.py:1709
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Nema informacija ni pomoći za /%s"
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: ../src/chat_control.py:1876
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: ../src/chat_control.py:1879
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: ../src/chat_control.py:1881
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:1886
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet druge strane nije potvrđen. Kliknite na ikonu štita za detalje."
 
-#: ../src/chat_control.py:1888
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1916 ../src/chat_control.py:1929
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Ova poruka NIJE kriptirana"
 
-#: ../src/chat_control.py:1922
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Ova poruka je kriptirana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2293
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:2294
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3221,15 +3311,15 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/chat_control.py:2442 ../src/common/connection_handlers.py:1846
-#: ../src/common/connection_handlers.py:1892
-#: ../src/common/connection_handlers.py:2080
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1239
-#: ../src/gajim.py:178
+#: ../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 "Pogreška Baze Podataka"
 
-#: ../src/chat_control.py:2443
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3238,7 +3328,7 @@ msgstr ""
 "Datoteku baze podataka (%s) nije moguće pročitati. Pokušajte je popraviti "
 "ili obrisati (svi zapisi razgovora će biti izgubljeni)."
 
-#: ../src/chat_control.py:2679
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
@@ -3247,159 +3337,171 @@ msgstr "%(name)s je trenutno %(status)s"
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../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 je datoteka ali bi trebao biti direktorij"
 
-#: ../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 će se sad isključiti"
 
-#: ../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 je direktorij ali bi trebao biti datoteka"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Izmjeni informacije o statusu"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Promjeni status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Postavi tip i opis prisustva"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Spojen"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Produženo odsustvo"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Ne uznemiravaj"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Neumreženo - prekid veze"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Opis prisustva:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Status je promjenjen."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s u %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Niste se  pridružili grupnom razgovoru"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Izaberite grupne razgovore koje želite napustiti"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:72 ../src/roster_window.py:785
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:5013
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Grupni Razgovori"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sljedeći grupni razgovor:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Proslijedi nepročitane poruke"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su proslijeđene."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i Notification-Daemon za prikazivanje obavijesti"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan kao rezultat mirovanja dužeg od $T min)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "odsutnosti."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posljedica mirovanja dužeg od $T min)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S će biti zamjenjen sa trenutnom statusnom porukom, $T vremena automatske "
 "produžene nedostupnosti."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:461
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3131
+#: ../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 "predefinirano"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Omogući lokalnu vezu/zeroconf poruke"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3409,7 +3511,7 @@ msgstr ""
 "'sometimes' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n"
 "'never' - nikada ne ispisuj vrijeme."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3420,18 +3522,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na "
 "'ponekad'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Koristi * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je Aktivno, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali "
 "omeđeno sa * *."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3441,7 +3543,7 @@ msgstr ""
 "odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3449,7 +3551,7 @@ msgstr ""
 "Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka "
 "tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3457,7 +3559,7 @@ msgstr ""
 "Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom "
 "razgovoru već koristi željeni nadimak"
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3468,19 +3570,19 @@ msgstr ""
 "Pogledati python dokumentaciju za strftime za kompletan opis: http://docs."
 "python.org/lib/module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3488,11 +3590,11 @@ msgstr ""
 "Koliko će se linija pamtiti iz prošlih razgovora kada se prozor/kartica "
 "razgovora ponovno otvori."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta trebaju trajati linije iz prošlog razgovora."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3500,11 +3602,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter i sa Enter napravi novu liniju. "
 "(Pretpostavljeno ponašanje Mirabilis ICQ klijenta)"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija se sprema za Ctrl+TipkaGORE"
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3513,11 +3615,11 @@ msgstr ""
 "Ili je osobni url koji sadrži %s, gdje je %s riječ ili fraza ili "
 "'WIKTIONARY' - što znači da koristi wiktionary."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolirati preko gajim-remote-a."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3528,14 +3630,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na Neaktivno i "
 "sinkroniziraju se sa globalnim statusom) ovisno o statusu mrežnog spoja."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslane obavijesti o statusu u razgovoru. Može biti jedno od svi,"
 "samo_sastavljanje, onemogućeno."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3543,7 +3645,7 @@ msgstr ""
 "Prikazane obavijesti o statusu u prozoru razgovora. Može biti jedno od svi, "
 "samo_sastavljanje, onemogućeno."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3551,11 +3653,11 @@ msgstr ""
 "Ako se ne ispisuje vrijeme za svaku poruku (print_time==ponekad), ispisati "
 "ga svakih x minuta"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj prije zatvaranja kartice/prozora razgovora grupe."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3563,7 +3665,7 @@ msgstr ""
 "Uvijek pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmakom odjeljenoj listi jid-ova grupnog razgovora."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3571,7 +3673,13 @@ msgstr ""
 "Nikad ne pitaj prije zatvaranja kartice/prozora grupnog razgovora u ovoj "
 "razmacima podjeljenoj listi jid-ova grupnog razgovora."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3579,35 +3687,27 @@ msgstr ""
 "Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim "
 "sučeljima, za prijenos datoteka u slučaju prosljeđivanja."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definira KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Obavijesti o svim događajima u traci radne površine."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži karticu ako je otvoren samo jedan razgovor?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaži granicu notesa sa karticama u prozorima razgovora?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Prikaži gumb za zatvaranje u kartici?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
-"želite zapisati vaš razgovor?"
-
-#: ../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 "
@@ -3619,18 +3719,18 @@ msgstr ""
 "Veći brojevi su sigurniji, ali im treba duže vremena za izračunavanje kod "
 "pokretanja sesije."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Pregled novih poruka kao obavijest u iskočnom prozoru?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista riječi odijeljena točka-zarezom koje će biti označene u grupnim "
 "razgovorima."
 
-#: ../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."
@@ -3638,14 +3738,14 @@ msgstr ""
 "Ako je Aktivno, Gajim se završava kad je pritisnut X gumb. Ova postavka je "
 "upotrebljena samo ako je \"trayicon\" u upotrebi."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je Aktivno, Gajim će provjeriti da li je zadani jabber klijent pri "
 "svakom pokretanju."
 
-#: ../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."
@@ -3653,7 +3753,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazvati ikonu na svakoj kartici koja sadrži "
 "nepročitane poruke. Ovisno o temi, ikona može biti i animirana."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3661,11 +3761,11 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati statusnu poruku, ako nije prazna, za "
 "svaki kontakt pod imenom kontakta na listi."
 
-#: ../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 "Definiraj poziciju avatara na listi. Mogu biti lijevo ili desno"
 
-#: ../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."
@@ -3673,7 +3773,7 @@ msgstr ""
 "Ako je Aktivno, će Gajim poslati upit za avatar svaki kontakt, koji nije "
 "imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3681,7 +3781,7 @@ msgstr ""
 "Ako je Neaktivno, više nećete vidjeti statusnu poruku u razgovorima, kada "
 "kontakt promjeni svoj status i/ili statusnu poruku."
 
-#: ../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 "
@@ -3695,29 +3795,29 @@ msgstr ""
 "prikazivati sve statusne poruke. Ako je \"in_and_out\" Gajim će prikazivati "
 "samo poruke tipa FOO je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakata u trenu prijave."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakata u trenu odjave."
 
-#: ../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 ""
 "Ako je Aktivno, vraćene poruke će koristiti manji font od predefiniranog."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u programskoj traci."
 
-#: ../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 "
@@ -3727,7 +3827,7 @@ msgstr ""
 "će bljeskati (pretpostavljeno ponašanje u većini Window Manager-a) kod novih "
 "događaja."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3738,7 +3838,7 @@ msgstr ""
 "u grupnim razgovorima."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3758,31 +3858,31 @@ msgstr ""
 "'pertype' - Svaki tip poruke (npr., razgovori i grupni razgovori) se šalje u "
 "vezani prozor."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako je Neaktivno, nećete više vidjeti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je Aktivno, pritisak na 'esc' tipku zatvara karticu/prozor."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Skriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Skriva baner u prozoru razgovora dviju osoba"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
 
-#: ../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."
@@ -3790,15 +3890,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku reda samo kada se ne radi o istoj "
 "osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko pomicanje kroz poruke u prozorima razgovora."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3806,11 +3906,11 @@ msgstr ""
 "Lista boja, odvojenih sa \":\", koje će biti korištene za bojanje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab idi na sljedeću karticu kada nema nepročitanih."
 
-#: ../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."
@@ -3818,7 +3918,7 @@ msgstr ""
 "Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan "
 "niz znači da nikada ne prikazujemo upit."
 
-#: ../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 "
@@ -3829,7 +3929,7 @@ msgstr ""
 "prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
 "poslužitelja."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3837,7 +3937,16 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
+"pohranio lozinke računa."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3845,7 +3954,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
 "redovima za račune i grupe."
 
-#: ../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"
@@ -3853,7 +3962,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
 "poruke kao da su izabrane vrste"
 
-#: ../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."
@@ -3861,7 +3970,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
 "poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
 
-#: ../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."
@@ -3869,12 +3978,12 @@ msgstr ""
 "Ako je Aktivno, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći "
 "dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Vrijeme neaktivnosti potrebno da bi se prozor za promjenu statusa zatvorio."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3882,7 +3991,7 @@ msgstr ""
 "Maksimalan broj linija koje se ispisuju u razgovorima. Najstarije linije se "
 "čiste."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3890,11 +3999,11 @@ msgstr ""
 "Ako je Aktivno, prozori sa obavijestima notification-daemon-a će biti "
 "prikačeni uz ikonu u traci radne površine."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Izaberi interval između dvije provjere nezaposlenosti."
 
-#: ../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."
@@ -3902,16 +4011,22 @@ msgstr ""
 "Promjeni vrijednost za promjenu veličine latex formule koja se prikazuje. "
 "Veća je viša."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Ispravne uri sheme. Samo sheme u ovoj listi će biti prihvaćene kao \"pravi\" "
 "uri."
 
-#: ../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."
@@ -3919,7 +4034,7 @@ msgstr ""
 "Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
 "definirani u autopriority_* opcijama."
 
-#: ../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"
@@ -3928,27 +4043,27 @@ msgstr ""
 "odsutan, produženo nedostupan, ne uznemiravaj, nevidljivd. PRIMJEDBA: ova "
 "postavka se koristi samo ako je restore_last_status onemogućen."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je označeno, vraća zadnji korišteni status."
 
-#: ../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 ""
 "Ako nije uključeno, ne potpisuj prisutnost GPG ključem, čak i kada je GPG "
 "postavljen."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj račun."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju, ako je to moguće?"
 
-#: ../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"
@@ -3956,35 +4071,44 @@ msgstr ""
 "Poredani popis (odjeljen razmakom) vrsta povezivanja za probati. Može "
 "sadržavati tls, ssl ili plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije korištenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
 
-#: ../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
+#, fuzzy
 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 ""
 "Koliko sekundi čekati odgovor keepalive paketa prije nego pokušamo ponovno "
 "spajanje."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../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."
@@ -3992,19 +4116,27 @@ msgstr ""
 "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran "
 "u file_transfer_proxies opcijama za prijenos."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtjev za potvrdom o primitku"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Šalji potvrde o primitku"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
+"želite zapisati vaš razgovor?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4012,101 +4144,101 @@ msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju sa ovim kontaktom, ako "
 "je to moguće?"
 
-#: ../src/common/config.py:404 ../src/common/config.py:407
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', ili 'both'"
 
-#: ../src/common/config.py:415 ../src/common/config.py:417
-#: ../src/common/config.py:418 ../src/common/config.py:421
-#: ../src/common/config.py:422
+#: ../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' ili ''"
 
-#: ../src/common/config.py:428 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:430 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:432 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Radim"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:440 ../src/config.py:1451
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: ../src/common/config.py:443 ../src/common/config.py:444
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4115,68 +4247,99 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: ../src/common/config.py:455
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:464 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:468 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:472
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:72
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Krivi domaćin"
 
-#: ../src/common/connection_handlers.py:235
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Neispravna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:640
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registracijske informacije za transport %s nisu došle na vrijeme"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1844
-#: ../src/common/connection_handlers.py:1890
-#: ../src/common/connection_handlers.py:2078
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1237
-#: ../src/gajim.py:400
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Registrirati se na %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Veza Prekinuta"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:867
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:868
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1240
-#: ../src/gajim.py:179
+#: ../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 "Neispravan Jabber ID"
+
+#: ../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: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."
@@ -4186,78 +4349,77 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
 "zapisi razgovora će biti izgubljeni)."
 
-#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljeni nadimak: %s "
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2040
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2046
-#: ../src/common/connection_handlers.py:2049
-#: ../src/common/connection_handlers.py:2053 ../src/gajim.py:563
+#: ../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 "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2044
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: ../src/common/connection_handlers.py:2047
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: ../src/common/connection_handlers.py:2050
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2096
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Soba je uništena"
 
-#: ../src/common/connection_handlers.py:2103
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: ../src/common/connection_handlers.py:2130
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2151
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada smo pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2153
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Zahtjev za ukidanjem pretplate od %s"
 
-#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada smo ukinuli pretplatu za %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4268,215 +4430,220 @@ msgstr ""
 "jabberstudio.org/ za uklanjanje"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Lozinka za OpenPGP nije unešena"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../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 "Biti će te spojeni na %s bez OpenPGP-a."
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Nemoguće dobaviti certifikat izdavača"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Nemoguće dobaviti CRL certifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nemoguće dekriptirati potpis certifikata"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nemoguće dekriptirati CRL potpis"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Nije moguće dekodirati izdavačev javni ključ"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu certifikata"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "Greška u CRL potpisu"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Certifikat još nije ispravan"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Certifikat je istekao"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "CRL nije još ispravan"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Format greška u certifikatovom notBefore polju"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Format greška u certifikatovom notAfter polju"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Format greška u CRL lastUpdate polju"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Format greška u CRL nextUpdate polju"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Nema dovoljno memorije"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Osobno potpisan certifikat"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Osobno potpisan certifikat u lancu"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "Nemoguće dobaviti certifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "Nemoguće potvrditi ispravnost prvog certifikata"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Lanac certifikata je pre dugačak"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Certifikat je poništen"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Neispravan CA certifikat"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Pređeno ograničenje duljine putanje"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha certifikata"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Certifikat nije pouzdan"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Certifikat odbijen"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Subject issuer mismatch"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority and subject key identifier mismatch"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority and issuer serial number mismatch"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:268
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:269
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: ../src/common/connection.py:280
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Poslužitelj %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: ../src/common/connection.py:314
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Poslužitelj %s je pružio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:327
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:343
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Prijenos %(name)s je krivo odgovorio na zahtjev za registraciju: %(error)s"
 
-#: ../src/common/connection.py:523
-msgid "Connection to proxy failed"
-msgstr "Veza na proxy nije uspjela"
-
-#: ../src/common/connection.py:622 ../src/common/connection.py:730
-#: ../src/common/connection.py:1372
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:623 ../src/gajim.py:1060
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: ../src/common/connection.py:657 ../src/common/connection.py:710
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Spremljeno u: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Veza na proxy nije uspjela"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: ../src/common/connection.py:658 ../src/common/connection.py:711
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Veza sa računom %s je izgubljena. Pokušajte ponovno spajanje."
 
-#: ../src/common/connection.py:680
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost certifikata %s bi mogla biti neispravna."
 
-#: ../src/common/connection.py:683
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4485,7 +4652,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: ../src/common/connection.py:685
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4494,24 +4661,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:731
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
 
-#: ../src/common/connection.py:756
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:758
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Molim vas da provjerite korisničko ime i lozinku za greške."
 
-#: ../src/common/connection.py:819
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: ../src/common/connection.py:820
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4520,25 +4687,30 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od vaših "
 "spojenih resursa. Obustavite ju i pokušajte ponovno."
 
-#: ../src/common/connection.py:1116
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 "Nije moguće poslati prazne datoteke"
+
+#: ../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 "Niti je udaljena prisutnost potpisana, niti je dodijeljen ključ."
 
-#: ../src/common/connection.py:1118
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 "Kontaktov ključ (%s) se ne podudara s ključem dodjeljenim u Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1127
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
 
-#: ../src/common/connection.py:1227
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4547,20 +4719,30 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1405
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Pozovi _Kontakte"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:72
-#: ../src/gajim.py:983
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Posmatrači"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:72 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1349 ../src/gajim.py:809 ../src/roster_window.py:815
-#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
+#: ../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 "Prijenosi"
 
@@ -4569,11 +4751,11 @@ msgid "Not in roster"
 msgstr "Nije na Listi Kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Ovom računalu nedostaju D-Bus python poveznice"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima ne mogu se koristiti"
 
@@ -4602,356 +4784,356 @@ msgstr ""
 "Sesijska sabirnica nije dostupna.\n"
 "Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dvanaest"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "jedan"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dva"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "četiri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "pet"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "šest"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sedam"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "osam"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "devet"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "deset"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "jedanaest"
 
+#. 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 "dvanaest"
+msgid "%(0)s o'clock"
+msgstr "%(0)s sati"
 
-#. 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 sati"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "pet poslije $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "pet poslije %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "deset poslije $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "deset poslije %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "četvrt poslije $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "četvrt poslije %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dvadeset poslije $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "dvadeset poslije %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dvadeset pet poslije $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "dvadeset pet poslije %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 i pola"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s i pola"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dvadeset i pet do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "dvadeset i pet do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dvadeset do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "dvadeset do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "četvrt do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "četvrt do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "deset do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "deset do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "pet do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "pet do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 sati"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s sati"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noć"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Rano jutro"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Jutro"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Skoro podne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Podne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Poslijepodne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Večer"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Kasna večer"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Početak tjedna"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Sredina tjedna"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Kraj tjedna"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Potrebna je adresa poslužitelja."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:215
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:218
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:222
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:225
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:229
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:232
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:235
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:283 ../src/features_window.py:119
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Odspojen"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: ../src/common/helpers.py:311
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: ../src/common/helpers.py:313
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Sudionici"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Sudionik"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "piše poruku..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: ../src/common/helpers.py:409
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
-#: ../src/common/helpers.py:983 ../src/common/helpers.py:990
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4959,22 +5141,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: ../src/common/helpers.py:996
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr "iz sobe %s"
 
-#: ../src/common/helpers.py:999 ../src/common/helpers.py:1018
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "od korisnika %s"
 
-#: ../src/common/helpers.py:1001
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1015
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4982,655 +5164,665 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaja na čekanju"
 
-#: ../src/common/helpers.py:1048
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Greška u izvršavanju \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s nije ispravna razina zapisnika (loglevel)"
+
 #. 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 "greška: nemogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim račun %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "računa %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Ustrašen"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Zapanjen"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Ljut"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Uznemiren"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Dosadno"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Hrabar"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Miran"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Hladno"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Razmišlja"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Hirovit"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Lud"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Kreativan"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Znatiželjan"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Bezvoljan"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Zastrašen"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Smeten"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Zavidan"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Koketan"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Tuguje"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Zanovijeta"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Kriv"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Sretan"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Pun nade"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Vruć"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Skroman"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Gladan"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Povrijeđen"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Pun strahopoštovanja"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Nezadovoljan"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Zainteresiran"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Pijan"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Nepobjediv"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Sretan"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Podmukao"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Zlovoljan"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Živčan"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Uvrijeđen"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Nasilan"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Razigran"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Ponosan"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Umiren"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Sažaljen"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Nemiran"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Tužan"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Zajedljiv"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Sramežljiv"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Bolestan"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: ../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 "Pod stresom"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Jak"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Umoran"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Neodređen"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Slab"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Radim kućanske poslove"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Kupujem namirnice"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Čistim"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Kuham"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Popravljam"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Perem Suđe"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Perem Rublje"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Uređujem vrt"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Obavljam nešto"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Šetam psa"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Pijem Pivo"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Pijem Kavu"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Pijem Čaj"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Marendam"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Doručkujem"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Večeram"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Ručam"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Vježbam"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Vozim Bicikl"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Plešem"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Planinarim"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Trčim"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Bavim se Sportom"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Trčim"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Skijam"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Plivam"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "U teretani"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Uređujem se"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "U Toplicama"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Perem Zube"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Na Šišanju"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Brijem se"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Kupam se"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Tuširam se"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Na Sastanku sam"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Slobodan Dan"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Družim se"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Skrivam se"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "Na Odmoru"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Molim se"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Planirani Praznik"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Razmišljam"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Opuštam se"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Pecam"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Igram se"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Izlazim"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Na tulumu"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Čitam"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Ponavljam"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Kupujem"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Pušim"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Družim se"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Sunčam se"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Gledam TV"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Gledam film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Telefoniram"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "Vani sam"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Koristim Mobitel"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Na Video Konferenciji"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Putujem"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Putujem na posao"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Vozim"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "U Automobilu"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "U Autobusu"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "U Avionu"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "U Vlaku"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "Na Putu"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Pješačim"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Programiram"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "Na Sastanku"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Učim"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Pišem"
 
@@ -5649,7 +5841,7 @@ msgstr ""
 "otkazan."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5666,17 +5858,17 @@ msgstr ""
 "Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju nije "
 "ispravan, biti će ignoriran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno "
 "spojiti."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5685,31 +5877,31 @@ msgstr ""
 "%s\n"
 "Poruke lokalne veze možda ne rade kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Molimo provjerite da su Avahi ili Bonjour instalirani."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalnu uslugu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nemoguće vezanje na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Molim provjerite da li je avahi-daemon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promjeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5717,65 +5909,49 @@ msgstr ""
 "Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Ova poruka je kriptirana]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Vašu poruku nije moguće poslati."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Vezu sa domaćinom nije moguće ostvariti: Isteklo vrijeme za slanja podataka."
 
-#: ../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 "Greška prilikom dodavanja usluge. %s"
 
-#: ../src/config.py:150 ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Aktivno"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Događaj"
-
-#: ../src/config.py:402
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Predefinirana Poruka"
 
-#: ../src/config.py:409
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../src/config.py:451
-msgid "Always use OS/X default applications"
-msgstr "Uvijek koristi OS/X predefinirane aplikacije"
-
-#: ../src/config.py:452
-msgid "Custom"
-msgstr "Osobni"
-
-#: ../src/config.py:645 ../src/dialogs.py:1199
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:646
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5785,251 +5961,210 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Prva Poruka Primljena"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Sljedeća Poruka Primljena sa Fokusom"
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Sljedeća Poruka Primljena bez Fokusa"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Kontakt Spojen"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Kontakt Odspojen"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Poruka Poslana"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Označavanje Poruke Grupnog Razgovora"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Primljena Poruka Grupnog Razgovora"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "Primljen Gmail Email"
-
 #. Name column
-#: ../src/config.py:1373 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
-#: ../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 "Ime"
 
-#: ../src/config.py:1459
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1460
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti."
 
-#: ../src/config.py:1585 ../src/config.py:1684
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računalu"
 
-#: ../src/config.py:1720 ../src/config.py:1763
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1721
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa."
 
-#: ../src/config.py:1747
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1748
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li "
 "nastaviti?"
 
-#: ../src/config.py:1759
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1760
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1764
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da bi ste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje"
 
-#: ../src/config.py:1770
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1771
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Ovo ime već koristi vaš drugi račun. Molim odaberite drugo ime."
 
-#: ../src/config.py:1775 ../src/config.py:1779
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1776
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1780
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1854
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Preimenuj Račun"
 
-#: ../src/config.py:1855
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za račun %s"
 
-#: ../src/config.py:1873 ../src/config.py:1881 ../src/config.py:1924
-#: ../src/config.py:3139 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Neispravan Jabber ID"
-
-#: ../src/config.py:1882
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:2072 ../src/config.py:3211
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2073 ../src/config.py:3212
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:2094
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2130
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2131
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:2138
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:2139
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:2146 ../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 "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:2147
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa poslužiteljom nije moguća izmjena osobnih informacija."
 
-#: ../src/config.py:2151
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:2152
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije."
 
-#: ../src/config.py:2183
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2184
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molim uklonite ili preimenujte prije omogućivanja poruka lokalne veze."
 
-#: ../src/config.py:2367
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2369
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2405
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2406
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2407
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2408
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2457 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2465
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2499
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2501
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6037,11 +6172,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2503
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2504
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6049,11 +6184,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2506
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2507
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6061,11 +6196,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2509
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6073,14 +6208,15 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2511
+#: ../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 ""
 "Može biti jedno od sljedećeg:\n"
 "1. korisnik@domena/resurs (poklapa se samo sa tim resursom).\n"
@@ -6089,85 +6225,90 @@ msgstr ""
 "4. domena (sama domena se poklapa, kao i bilo koji korisnik@domena,\n"
 "domena/resurs, ili adresa koja sadrži poddomenu."
 
-#: ../src/config.py:2608
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2630 ../src/gajim.py:1432 ../src/roster_window.py:1932
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2631 ../src/roster_window.py:1906
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2632 ../src/roster_window.py:1933
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2641
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2642
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2738
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:2738
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:2739
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
-#: ../src/config.py:2740
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:2808
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:2842
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molim obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu "
 "oznaku."
 
-#: ../src/config.py:3122
-msgid "Invalid username"
-msgstr "Neispravno korisničko ime"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3124
-msgid "You must provide a username to configure this account."
-msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Nedozvoljeni nadimak: %s "
 
-#: ../src/config.py:3150
-msgid "Duplicate Jabber ID"
-msgstr "Dvostruki Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Neispravan poslužitelj"
 
-#: ../src/config.py:3151
-msgid "This account is already configured in Gajim."
-msgstr "Ovaj račun je već konfiguriran u Gajimu."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Neispravan unos"
 
-#: ../src/config.py:3168
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3169 ../src/config.py:3358
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6176,24 +6317,32 @@ msgstr ""
 "Napredne opcije računa možete urediti pritiskom na gumb Napredno, ili "
 "kasnije klikom na Korisnički Računi u izborniku Uredi."
 
-#: ../src/config.py:3187
-msgid "Invalid server"
-msgstr "Neispravan poslužitelj"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Vaš novi račun je uspješno stvoren"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3188
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte poslužitelj na koji se želite registrirati."
 
-#: ../src/config.py:3239 ../src/gajim.py:2010
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: ../src/config.py:3240 ../src/gajim.py:2011
+#: ../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 "Ovaj certifikat je već u datoteci %s, neće biti ponovno dodan."
 
-#: ../src/config.py:3308
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6208,7 +6357,7 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/config.py:3314 ../src/gajim.py:2034
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6219,14 +6368,10 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: ../src/config.py:3337 ../src/config.py:3376
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3357
-msgid "Your new account has been created successfully"
-msgstr "Vaš novi račun je uspješno stvoren"
-
 #: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
@@ -6235,7 +6380,51 @@ msgstr "Ime računa se već koristi"
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktivno"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Događaj"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Prva Poruka Primljena"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Sljedeća Poruka Primljena sa Fokusom"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Sljedeća Poruka Primljena bez Fokusa"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontakt Spojen"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontakt Odspojen"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Poruka Poslana"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Označavanje Poruke Grupnog Razgovora"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Primljena Poruka Grupnog Razgovora"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Primljen Gmail Email"
+
+#: ../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"
@@ -6245,7 +6434,7 @@ msgstr ""
 "primljena sa druge strane. Ukoliko se ova ikona zadrži\n"
 "duže vremena moguće je da je poruka izgubljena."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6253,74 +6442,74 @@ msgstr ""
 "Tekst niže od ove linije je ono što je rečeno od kad ste\n"
 "zadnji puta obraćali pozornost na ovaj grupni razovor"
 
-#: ../src/conversation_textview.py:691
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Izlaz"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:703
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:708
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u riječnika nedostaje \"%s\" i nije WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:738
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:741
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
-#: ../src/conversation_textview.py:1014 ../src/conversation_textview.py:1032
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Greška u izvršavanju \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1289
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Jučer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1293
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Prije %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber ID je već na listi"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber ID koji ste unjeli je već na popisu. Izaberite drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "novi@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "novi%d@jabber.id"
@@ -6335,139 +6524,139 @@ msgstr "Ime kontakta: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "ID ključa"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Postavi Raspoloženje"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna Poruka"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Statusna Poruka"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Prepiši Statusnu Poruku?"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Želite prepisati ovu statusnu poruku?"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Molim unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Adresa:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Adresa:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Adresa:"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati za račun %s"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima "
 "paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -6475,7 +6664,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6487,88 +6676,88 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Nadimak sadrži nedozvoljene znakove."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtjev za pretplatu na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2635
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1451
-#: ../src/groupchat_control.py:1732
-msgid "The nickname has not allowed characters."
-msgstr "Nadimak sadrži nedozvoljene znakove."
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1899
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1900
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../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:"
@@ -6577,276 +6766,302 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../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 "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. 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 "Kontakt Se Prijavio"
 
-#: ../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 Se Odjavio"
 
 #. 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 "Nova Poruka"
 
 #. 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 "Nova Jedna Poruka"
 
 #. 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 "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1597 ../src/notify.py:486
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1663 ../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 "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1563 ../src/gajim.py:1630
-#: ../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 "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1705 ../src/gajim.py:1727
-#: ../src/gajim.py:1744 ../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 "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1708 ../src/notify.py:484
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1453 ../src/notify.py:488
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:490
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: ../src/dialogs.py:2559
+#. 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 "Želio bih Vas dodati na moju listu kontakata."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Adresa:"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Zlovoljan"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupa"
+
+#. 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 "Želio bih te dodati na moju listu kontakata."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redoslijed: %(order)s, akcija: %(action)s, tip: %(type)s, vrijednost: %"
 "(value)s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s"
 
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
 #. # means number
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/dialogs.py:3351
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6857,19 +7072,19 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:3833 ../src/dialogs.py:3920
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Kontaktov identitet potvrđen"
 
-#: ../src/dialogs.py:3841
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Potvrdi ponovno..."
 
-#: ../src/dialogs.py:3846
+#: ../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 "
@@ -6879,19 +7094,19 @@ msgstr ""
 "ili slati vama poruke, morate potvrditi njihov identitet klikom na dugme "
 "ispod."
 
-#: ../src/dialogs.py:3849 ../src/dialogs.py:3901 ../src/dialogs.py:3914
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktov identitet NIJE potvrđen"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Jeste li potvrdili kontaktov identitet?"
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6906,22 +7121,22 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Jeste li razgovarali sa drugom stranom i potvrdili SAS?"
 
-#: ../src/dialogs.py:3902
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktov ključ (%s) <b>se ne podudara</b> sa ključem dodijeljenim u Gajim."
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
 
-#: ../src/dialogs.py:3915
+#: ../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."
@@ -6930,7 +7145,7 @@ msgstr ""
 "ključu</b>, tako da poruke <b>nemogu</b> biti kriptirane. Promjenite razinu "
 "povjerenja u njegov ključ sa GPG klijentom."
 
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -6938,33 +7153,33 @@ msgstr ""
 "GPG ključ je dodijeljen ovom kontaktu, i vi vjerujete njegovom ključu, tako "
 "da će poruke biti kriptirane."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6972,220 +7187,244 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovakav tip usluge ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Izvrši Naredbu..."
 
-#: ../src/disco.py:1190 ../src/disco.py:1354
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Knjižna oznaka je već postavljena"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Knjižna oznaka je bez uspješno dodana"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
+"spisku."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Greška SSL certifikata"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi za ovjeru certifikata poslužitelja da bi se "
 "osigurala sigurna veza."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Potreban je python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Razgovori bez centralnog poslužitelja sa automatskim otkrivanjem klijenata u "
 "lokalnoj mreži."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Potreban je python-avahi."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Potreban je pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Komanda: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta koja kontrolira Gajim iz naredbene linije."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Potreban je python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88
+#: ../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 "Mogućnost nije dostupna za Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP Enkripcija"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Kriptiranje poruka sa gpg ključevima."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Potrebni su gpg i python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Automatsko otkrivanje mrežnog statusa."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Potreban je gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Upravljanje Sesijama"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana kod gašenja i povraćena kod pokretanja."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Potreban je python-gnome2."
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Lozinka za ulaz u sobu"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu spremati sigurno, ne samo kao običan tekst."
 
-#: ../src/features_window.py:75
-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 "Potrebni su gnome-keyring i python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Mogućnost spajanja na poslužitelje koji koriste SRV spise."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Potreban je dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Potreban je nslookup za korištenje SRV spisa."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Provjera Pravopisa"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Provjera pravopisa napisanih poruka."
 
-#: ../src/features_window.py:83
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Potreban je python-gnome2-extras ili kompilacija gtkspell modula iz Gajim "
-"izvornog paketa."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Potreban je python-sexy."
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Obavijesti"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Neaktivni prozori sa obavijestima o novim događajima."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7193,52 +7432,53 @@ msgstr ""
 "Potreban je python-notify ili umjesto toga python-dbus u kombinaciji sa "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Trayicon"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ikona u traci radne površine koja odražava trenutni status."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Potreban je python-gnome2-extras ili kompiliran trayicon modul iz Gajim "
 "izvornog koda."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Potreban je PyGTK >= 2.10."
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Idle"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Uredi prema statusu"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Mogućnost mjerenja vremena neaktivnosti, da bi se postavio automatski status."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Potreban je python-gnome2."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$ znakova."
 
-#: ../src/features_window.py:99
+#: ../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."
@@ -7246,7 +7486,7 @@ msgstr ""
 "Potrebni su texlive-latex-base i dvipng. Morate postaviti 'use_latex' na "
 "Aktivno u Naprednom Uređivaču Postavki."
 
-#: ../src/features_window.py:100
+#: ../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."
@@ -7254,23 +7494,25 @@ msgstr ""
 "Potrebni su texlive-latex-base i dvipng (Sve je u MixTeX). Morate postaviti "
 "'use_latex' na Aktivno u Naprednom Uređivaču Postavki."
 
-#: ../src/features_window.py:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "End to End enkripcija"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Kriptiranje poruka."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Potreban je python-crypto."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7278,23 +7520,23 @@ msgstr ""
 "Generira XHTML izlaz iz RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Potreban je python-docutils."
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Mogućnost pretvaranja natpisa u zaglavljima prozora u URL linkove."
 
-#: ../src/features_window.py:111 ../src/features_window.py:112
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Potreban je python-sexy."
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Funkcija"
 
@@ -7323,7 +7565,7 @@ msgstr "veličina: %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:496
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Vi"
 
@@ -7333,7 +7575,7 @@ msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Primatelj: "
 
@@ -7365,26 +7607,27 @@ msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Prijenos datoteka je otkazao kontakt na drugoj strani"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Odabir Datoteke za Slanje..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
@@ -7404,33 +7647,33 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: ../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 "Nije moguće prepisati postojeću datoteku \"%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."
 msgstr "Datoteka sa ovim imenom već postoji i nemate ovlasti prepisati ju."
 
-#: ../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 "Ova datoteka već postoji"
 
-#: ../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 "Å to želite učiniti?"
 
 #. 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 "U direktorij \"%s\" nije moguće zapisivati"
 
-#: ../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 "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
@@ -7466,11 +7709,11 @@ msgstr "Datoteka: "
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
@@ -7478,36 +7721,40 @@ msgstr "Pošiljatelj: "
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:93
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s nije ispravna razina zapisnika (loglevel)"
-
-#: ../src/gajim.py:165
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim treba X poslužitelj za rad. Izlaz..."
 
-#: ../src/gajim.py:194
-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 treba pyGTK 2.8 ili viši"
 
-#: ../src/gajim.py:195
-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 needs PyGTK 2.8 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:197
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim treba GTK 2.8 ili viši"
 
-#: ../src/gajim.py:198
-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 treba GTK 2.8 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ nema podršku za libglade"
 
-#: ../src/gajim.py:205
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7516,21 +7763,21 @@ msgstr ""
 "Molim uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu verziju "
 "sa %s"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Molim provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim treba PySQLite2 za pokretanje"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:221
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7540,11 +7787,11 @@ msgstr ""
 "na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7552,25 +7799,35 @@ msgstr ""
 "Trenutno je već pokrenuta jedna instanca Gajima\n"
 "Svejedno pokrenuti?"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/gajim.py:501
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "GPG ključ nije dodjeljen"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Biti će te spojeni na %s bez OpenPGP-a."
+
 #. ask again
-#: ../src/gajim.py:516
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: ../src/gajim.py:517
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gajim.py:564
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7581,50 +7838,59 @@ msgstr ""
 "registriran od strane drugog učesnika.\n"
 "Molimo unesite drugi nadimak ispod:"
 
-#: ../src/gajim.py:578
+#: ../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 "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
 
-#: ../src/gajim.py:583
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:631 ../src/notify.py:492 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../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 "Greška %(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 "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Zahtjev za Pretplatom"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:998
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status."
 
-#: ../src/gajim.py:1017
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gajim.py:1018
+#: ../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?"
@@ -7632,73 +7898,78 @@ msgstr ""
 "Uvijek ćete vidjeti njega ili nju kao odspojenu.\n"
 "Želite li ukloniti njega ili nju sa vaše liste kontakata?"
 
-#: ../src/gajim.py:1059
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Ukinuti pretplatu"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: ../src/gajim.py:1235 ../src/groupchat_control.py:1162
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/gajim.py:1253 ../src/groupchat_control.py:1337
-#: ../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 je trenutno %(status)s"
 
-#: ../src/gajim.py:1316
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(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:1380 ../src/groupchat_control.py:1122
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Došlo je do non-privacy-related promjene u postavkama sobe"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1391
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: ../src/gajim.py:1401
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada fully-anonymous"
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Potrebna je lozinka za pridruživanje grupnom razgovoru %s. Molim unesite je."
 
-#: ../src/gajim.py:1467
+#: ../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"
@@ -7706,20 +7977,48 @@ msgstr ""
 "Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
 "odgovorio sa krivom lozinkom.\n"
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gajim.py:1472
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije točna"
 
-#: ../src/gajim.py:1574
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG nije upotrebljiv"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
+
+#: ../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 "_Ne pitaj me više"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tispravno pokrenut "
+"(vjerovatno varijabla okruženja nije \t\t\t\t\t\t\tispravno postavljena)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1576
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7727,7 +8026,7 @@ msgstr[0] "Imate %d novi E-mail razgovor"
 msgstr[1] "Imate %d nova E-mail razovora"
 msgstr[2] "Imate %d novih E-mail razgovora"
 
-#: ../src/gajim.py:1589
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7742,34 +8041,44 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1660
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gajim.py:1728
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Greška pri čitanju datoteke:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspješno ste primili %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1732
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prijenos %(filename)s od %(name)s je zaustavljen."
 
-#: ../src/gajim.py:1745
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspješno ste poslali %(filename)s %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1749
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1837
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7778,46 +8087,46 @@ msgstr ""
 "Nemoguće dekriptirati poruke od %s\n"
 "Možda ih je netko izmjenio."
 
-#: ../src/gajim.py:1844
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Nemoguće dekriptirati poruku"
 
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:1916
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Molim unesite novo korisničko ime za vaš lokalni račun"
 
-#: ../src/gajim.py:1928
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1941
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1952
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gajim.py:1977
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: ../src/gajim.py:1978
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7828,19 +8137,19 @@ msgstr ""
 "(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/gajim.py:2037
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: ../src/gajim.py:2052
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Greška SSL certifikata"
 
-#: ../src/gajim.py:2053
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7852,11 +8161,11 @@ msgstr ""
 "\n"
 "Još uvijek se želite povezati i korigirati otisak certifikata?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Nesigurna Veza"
 
-#: ../src/gajim.py:2076
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7864,16 +8173,11 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nekriptirane veze. Jeste li sigurni "
 "da želite nastaviti?"
 
-#: ../src/gajim.py:2078 ../src/gajim.py:2108
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, stvarno želim nesigurno povezivanje"
 
-#: ../src/gajim.py:2079 ../src/gajim.py:2109 ../src/groupchat_control.py:1841
-#: ../src/roster_window.py:3769
-msgid "Do _not ask me again"
-msgstr "_Ne pitaj me više"
-
-#: ../src/gajim.py:2106
+#: ../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?"
@@ -7881,27 +8185,27 @@ msgstr ""
 "Spremate se poslati vašu lozinku preko nesigurne veze. Trebali bi "
 "instalirati PyOpenSSL da bi to izbjegli. Sigurni ste da želite nastaviti?"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije obrisan"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2592 ../src/gajim.py:2614
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/gajim.py:2593
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Postavljena tema emotikona nije pronađena, emotikoni su onemogućeni."
 
-#: ../src/gajim.py:2615
+#: ../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 "
@@ -7911,57 +8215,38 @@ msgstr ""
 "format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
 "Emoticons za više detalja."
 
-#: ../src/gajim.py:2641 ../src/roster_window.py:3303
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2920
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: ../src/gajim.py:3017
-msgid "Bookmark already set"
-msgstr "Knjižna oznaka je već postavljena"
-
-#: ../src/gajim.py:3018
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama."
-
-#: ../src/gajim.py:3031
-msgid "Bookmark has been added successfully"
-msgstr "Knjižna oznaka je bez uspješno dodana"
-
-#: ../src/gajim.py:3032
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem "
-"spisku."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Prikazuje prozor sa sljedećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7969,49 +8254,50 @@ msgstr ""
 "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u "
 "odvojenoj liniji"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "račun"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "prikaži samo kontakte ovog računa"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registriranih računa"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Mjenja status jednog računa ili više njih"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "poruka"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8020,19 +8306,23 @@ msgstr ""
 "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dialog razgovora kako bi mogli slati poruke kontaktu"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je označeno, kontak se uzima sa kontakt liste ovog računa"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8042,29 +8332,29 @@ msgstr ""
 "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo postavite "
 "'OpenPGP ključ' kao ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8074,134 +8364,134 @@ msgstr ""
 "želite postaviti samo 'račun', bez 'OpenPGP ključa', postavite 'OpenPGP "
 "ključ' kao ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku grupnom razgovoru kojem ste pristupili."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID kontakta"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o računu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Ime računa"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Å alje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Putanja datoteke"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Prikatuje sve postavke i njihove vrijednosti"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ključ=vrijednost"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Briše element postavke"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "ime postavke koja će se brisati"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvaranje dialoga 'Započeti Razgovor'"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj račun"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Šalje korisnički XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8209,67 +8499,72 @@ msgstr ""
 "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan "
 "na sve račune"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Rukuj xmpp:/ adresama"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI za obraditi"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Račun sa kojim želite obraditi"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "sadržaj poruke"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Pridruživanje Novoj Sobi"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID Sobe"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Lozinka za ulaz u sobu"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Račun sa kojeg želite ući u sobu"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Provjerite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8278,15 +8573,15 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molim odredite račun za slanje poruke."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nije pokrenut. Nije moguće koristiti gajim-remote."
 
-#: ../src/gajim-remote.py:403
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8295,16 +8590,16 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:407
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8313,7 +8608,7 @@ msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:480
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8322,7 +8617,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:485
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8331,7 +8626,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije određen. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:504
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Krivi uri"
 
@@ -8348,174 +8643,178 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Molim napravite novu temu sa vašim željenim imenom."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "ime teme"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati svoju trenutnu temu"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Molim prvo odaberite neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:149
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:151
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:602
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: ../src/groupchat_control.py:604
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: ../src/groupchat_control.py:1025
-msgid "Really send file?"
-msgstr "Zaista pošalji datoteku?"
-
-#: ../src/groupchat_control.py:1026
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Ako pošaljete datoteku osobi %s, on/ona će znati vaš pravi Jabber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1125
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Poslužitelj je dodijelio ili promjenio vaš nadimak"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1136
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:1151
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1198 ../src/groupchat_control.py:1202
-#: ../src/groupchat_control.py:1207
+#: ../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 je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Pripadnost %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Pripadnost %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1731
-msgid "Invalid nickname"
-msgstr "Neispravan nadimak"
-
-#: ../src/groupchat_control.py:1474 ../src/groupchat_control.py:1492
-#: ../src/groupchat_control.py:1576 ../src/groupchat_control.py:1593
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s"
 
-#: ../src/groupchat_control.py:1654
+#: ../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 "Nadimak nije pronađen: %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 ""
 "Uporaba: /%s <nickname|JID> [razlog], zabranjuje pristup JID-u u sobu. "
 "Nadimak učesnika može biti zamjenjen, ali ne ako sadrži \"@\". Ako je JID "
 "trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima NISU "
 "podržani."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8523,7 +8822,7 @@ msgid ""
 msgstr ""
 "Uporaba: /%s <nickname>, otvara privatni razgovor sa navedenim učesnikom."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8532,7 +8831,7 @@ msgstr ""
 "Uporaba: /%s [razlog], zatvara trenutni prozor ili karticu, i prikazuje "
 "razlog ako je specificiran."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8541,7 +8840,7 @@ msgstr ""
 "Uporaba: /%s <JID> [razlog], poziva JID u trenutni grupni razgovor, "
 "opcionalno dajući razlog."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8550,18 +8849,17 @@ msgstr ""
 "Uporaba: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost spajanja na "
 "sobu@poslužitelj koristeći navedeni nadimak."
 
-#: ../src/groupchat_control.py:1681
-#, 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 ""
 "Uporaba: /%s <nickname> [razlog], uklanja učesnika specificiranog nadimkom "
 "iz grupnog razgovora i opcionalno prikazuje razlog. NE podržava razmake u "
 "nadimku."
 
-#: ../src/groupchat_control.py:1690
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8570,62 +8868,77 @@ msgstr ""
 "Uporaba: /%s <nickname> [poruka], otvara prozor privatne poruke i šalje "
 "poruku učesniku navedenom nadimkom."
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uporaba: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uporaba: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Uporaba: /%s <message>, šalje poruku bez gledanja za ostale komande."
 
-#: ../src/groupchat_control.py:1835
+#: ../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 ""
+"Uporaba: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom razgovoru."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora."
 
-#: ../src/groupchat_control.py:1874
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1875
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1880
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1906
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1907
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8633,22 +8946,22 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2080
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2081 ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2372
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -8678,75 +8991,75 @@ msgstr "Detalji"
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke:"
 
 #. 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 "Nije moguće pisati u %s. Rukovanje sesijama neće biti moguće"
 
 #. 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 nije zadani Jabber klijent"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li postaviti Gajim za zadani Jabber klijent?"
 
-#: ../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 "Uvijek provjeri ako je Gajim zadani Jabber klijent, pri pokretanju"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../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 ""
 "Sliku nije moguće spremiti u %(type)s formatu. Spremiti kao %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakti"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../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:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8754,7 +9067,7 @@ msgstr ""
 "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM "
 "POKRENUT)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8768,27 +9081,27 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Izvozim Zapise..."
 
-#: ../src/history_manager.py:509
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py:546
+#: ../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] "Da li zaista želite ukloniti zabilješke odabranog kontakta?"
 msgstr[1] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
 msgstr[2] "Da li zaista želite ukloniti zabilješke odabranih kontakata?"
 
-#: ../src/history_manager.py:550 ../src/history_manager.py:585
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: ../src/history_manager.py:582
+#: ../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] "Da li zaista želite ukloniti odabranu poruku?"
@@ -8819,27 +9132,37 @@ msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:433
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Niste spojeni na poslužitelj."
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Da li zaista želite ukloniti odabranu poruku?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:435
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:437
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Poruke"
 
@@ -8851,66 +9174,67 @@ msgstr "- poruke će biti zapisane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti zapisane"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Privatna Poruka iz privatnog razgovora %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 "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Općenito"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignoriraj"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2768
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2771
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2773 ../src/roster_window.py:2784
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
@@ -8942,54 +9266,46 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:286 ../src/roster_window.py:940
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:1909
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tispravno pokrenut "
-"(vjerovatno varijabla okruženja nije \t\t\t\t\t\t\tispravno postavljena)"
-
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2103 ../src/roster_window.py:3247
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../src/roster_window.py:2104 ../src/roster_window.py:3248
+#: ../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?"
@@ -8997,15 +9313,28 @@ msgstr ""
 "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2130
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505
+#: ../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 "Jeste li sigurni da želite napustiti grupni razgovor \"%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 "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:2269
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9013,16 +9342,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu "
 "povijest i kontakt je na vašoj listi."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9030,11 +9359,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9044,51 +9373,56 @@ msgstr ""
 "prijenosa: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2649
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:2650
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2716
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno ukloni i sve kontakte iz ove grupe sa liste kontakata"
 
-#: ../src/roster_window.py:2755
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:3108
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9097,11 +9431,11 @@ msgstr ""
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3117
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/roster_window.py:3121
+#: ../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."
@@ -9109,16 +9443,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje "
 "što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9128,20 +9462,20 @@ msgstr ""
 "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek "
 "vidjeti kao da ste odspojeni."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima."
 
-#: ../src/roster_window.py:3687
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:3689
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9149,13 +9483,13 @@ msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: ../src/roster_window.py:3763
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Spremate se stvoriti metakontakt. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3765
+#: ../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 "
@@ -9165,11 +9499,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:3878
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:3889
+#: ../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:"
@@ -9177,128 +9511,130 @@ msgstr[0] "Želite li poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati ove datoteke kontaktu %s:"
 msgstr[2] "Želite li poslati ove datoteke kontaktu %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Poslati %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Učini %s i %s pseudokontaktima"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4566 ../src/roster_window.py:4637
-#: ../src/roster_window.py:4646 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4653
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4695 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižni_m Oznakama..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:4755
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
-#: ../src/roster_window.py:4817 ../src/roster_window.py:4926
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:4844
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:4851
-msgid "Mood"
-msgstr "Raspoloženje"
-
-#: ../src/roster_window.py:4855
-msgid "Activity"
-msgstr "Aktivnost"
-
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Postavi Usluge..."
 
-#: ../src/roster_window.py:5014
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5022 ../src/roster_window.py:5548
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: ../src/roster_window.py:5030
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Želio bih vas dodati na svoju listu kontakata"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
 #. Send single message
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
 #. Modify Transport
-#: ../src/roster_window.py:5693
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Novi Grupni Razgovor"
 
 #. History manager
-#: ../src/roster_window.py:5967
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: ../src/roster_window.py:5976
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
@@ -9315,20 +9651,20 @@ msgstr "Greška u primljenom podatkovnom obrascu"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Disk WriteError"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Potvrdi ove sesijske postavke"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9343,7 +9679,7 @@ msgstr ""
 "\n"
 "\tJesu li te postavke prihvatljive?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9358,124 +9694,116 @@ msgstr ""
 "\n"
 "Nastavi sesiju?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: ../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 ovog grupnog razgovora"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr "[blokirano]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr "[minimizirano]"
 
-#: ../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 "Zadnji status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Spojen"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Odspojen"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Raspoloženje:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Aktivnost:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Glazba:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Podizanje"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Nije početo"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Završeno"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?status prijenosa:Stanka"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: ../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"
@@ -9491,16 +9819,21 @@ msgstr "?Klijent:Nepoznat"
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Klijent:Nepoznat"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9508,7 +9841,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9516,40 +9849,126 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Ne interesira vas prisutnost kontakta, niti vaša prisutnost zanima njega/nju"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Kliknite da bi vidjeli mogućnosti (kao što su MSN, ICQ transporti) jabber "
+#~ "poslužitelja"
+
+#~ msgid "Servers Features"
+#~ msgstr "Mogućnosti Poslužitelja"
+
+#~ msgid "Your JID:"
+#~ msgstr "Vaš JID:"
+
+#, fuzzy
+#~ msgid "B_OSH Port:"
+#~ msgstr "_Port:"
+
+#~ msgid "Name:"
+#~ msgstr "Ime:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Prikaži _listu kontakata"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Označite račun za sinkronizaciju"
+
+#~ msgid "Modify Account"
+#~ msgstr "Izmjeni Račun"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s od %(artist)s\n"
+#~ "šalje %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim račun %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#~ msgid "Custom"
+#~ msgstr "Osobni"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Dvostruki Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Ovaj račun je već konfiguriran u Gajimu."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Potreban je python-gnome2-extras ili kompilacija gtkspell modula iz Gajim "
+#~ "izvornog paketa."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Idle"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Prijenos datoteka je otkazao kontakt na drugoj strani"
+
+#~ msgid "Generic"
+#~ msgstr "Općenito"
+
+#~ msgid "Mood"
+#~ msgstr "Raspoloženje"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivnost"
+
 #~ msgid "_Host:"
 #~ msgstr "_Poslužitelj:"
 
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Potrebno je kompilirati idle modul iz Gajim izvornog koda."
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP Enkripcija"
-
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s nije ustupio OpenPGP ključ, niti mu je ikoji dodijeljen"
 
@@ -9763,9 +10182,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "_Pop it up"
 #~ msgstr "_Iskoči ga"
 
-#~ msgid "Address"
-#~ msgstr "Adresa:"
-
 #~ msgid "City:"
 #~ msgstr "Mjesto:"
 
@@ -9880,9 +10296,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Spusti %s u grupu %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Učini %s i %s pseudokontaktima"
-
 #~ msgid "If True, autojoined bookmarked rooms will be minimized on startup."
 #~ msgstr ""
 #~ "Ako je Istinito, označene sobe kojima se automatski pristupa će biti "
diff --git a/po/it.po b/po/it.po
index 5404a8ff0..ec4fe5297 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,10 +10,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-09-14 20:53+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:53+0200\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
-"Language-Team: Italian\n"
+"Language-Team: Italian <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,7 +41,7 @@ msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
@@ -63,7 +63,7 @@ msgid "_Personal Events"
 msgstr "Informazioni personali"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Inizia chat..."
 
@@ -96,66 +96,64 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Selezionare un 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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Clicca per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usa autenticazione"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Connettiti alla pressione di Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ho già un account da usare"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Gestisci..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Ricorda la pass_word"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Servizi del server"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Configura il mio profilo appena effettuata la connessione"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/porta personalizzati"
 
@@ -168,30 +166,31 @@ msgstr ""
 "alla rete Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Il tuo JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Nome dell'_host: "
 
+#: ../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 "ID _Jabber:"
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Password:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
@@ -199,11 +198,6 @@ msgstr "_Porta:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Nome utente:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -212,18 +206,16 @@ msgstr "<b>Varie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazioni personali</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Account"
 
@@ -232,23 +224,22 @@ msgid "Account Modification"
 msgstr "Modifica account"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Operazioni amministrative"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Riconnetti automaticamente quando si perde la connessione"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnetti all'avvio di Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
@@ -264,38 +255,36 @@ msgstr ""
 "server la annuncia, e abilitando questa opzione TLS sarà disabilitata"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Scegli _chiave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Clicca per cambiare la password dell'account"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Clicca per richiedere l'autorizzazione a tutti i contatti di un altro account"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Connessione"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -303,17 +292,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Generale"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome dell'host: "
 
@@ -337,7 +323,6 @@ msgstr ""
 "timeout che provoca una disconnessione"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -347,7 +332,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -357,7 +341,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -372,43 +355,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Nessuno"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porta: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_tà:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -419,7 +404,7 @@ msgstr ""
 "account; il client con la maggiore priorità riceverà gli eventi"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "La priorità cambierà automaticamente in funzione del tuo stato."
 
@@ -428,12 +413,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "_Risorsa: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -448,30 +433,25 @@ msgstr ""
 "(vedi sotto)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Salva _passphrase (non sicuro)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "_Registra le conversazioni con tutti i contatti"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Sincronizza contatti"
@@ -481,21 +461,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Usa _SSL (vecchio)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Usa proxy per il trasferimento file"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Modifica lo stato"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "ID _Jabber:"
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 msgid "_Name:"
 msgstr "_Nome:"
 
@@ -504,31 +479,38 @@ msgstr "_Nome:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Privacy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Modifica lo stato"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Account"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usa autenticazione"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnetti all'avvio di Gajim"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Abilita"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Nome:"
 
@@ -538,7 +520,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -549,56 +530,96 @@ msgstr ""
 "Potresti considerare di cambiare la configurazione del firewall"
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Cognome:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Unisci account"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Invia pacchetti di keep-alive"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Usa hostname/porta personalizzati"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Usa porta personalizzata:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Modifica informazioni personali..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Abilita"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome dell'_host: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Gestisci..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porta:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "A_ccount:"
@@ -784,7 +805,7 @@ msgid "All statuses"
 msgstr "Tutti gli stati"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Assente"
 
@@ -801,7 +822,7 @@ msgid "Have "
 msgstr "Ho "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisibile"
 
@@ -810,7 +831,7 @@ msgid "Launch a command"
 msgstr "Lancia un comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Non disponibile"
 
@@ -931,7 +952,7 @@ msgstr "Ultima modifica:"
 msgid "New entry received"
 msgstr "Nuova voce ricevuta"
 
-#: ../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 "Hai ricevuto un nuovo evento:"
 
@@ -978,11 +999,21 @@ msgstr "Inserire nuova password:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Scrivere il nuovo messaggio di stato</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Attivato"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Stanza:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Messaggi predefiniti:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Salva come predefinito..."
 
@@ -1043,11 +1074,11 @@ msgstr "_Aggiungi ai contatti"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Cronologia"
 
@@ -1159,7 +1190,7 @@ msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Mostra una notifica popup quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -1195,7 +1226,7 @@ msgstr ""
 "Contatto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Grassetto"
 
@@ -1215,11 +1246,11 @@ msgstr "Personalizzazione temi di Gajim"
 msgid "Gone"
 msgstr "Andato via"
 
-#: ../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 "Inattivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Corsivo"
 
@@ -1267,7 +1298,7 @@ msgstr "Cambia _oggetto..."
 msgid "Configure _Room..."
 msgstr "Configura la _stanza..."
 
-#: ../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 "Aggiungi _segnalibro"
 
@@ -1299,23 +1330,37 @@ msgstr "_Amministratore"
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../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 "_Blocca"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Proprietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Invia messaggio privato"
 
-#: ../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 "_Sblocca"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voce"
 
@@ -1323,13 +1368,13 @@ msgstr "_Voce"
 msgid "Create new post"
 msgstr "Crea nuovo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Da"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Oggetto"
 
@@ -1355,7 +1400,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gestore cronologia di Gajim"
 
-#: ../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 "Elimina"
 
@@ -1380,7 +1426,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Cerca nel database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Cronologia conversazione"
 
@@ -1401,7 +1447,7 @@ msgstr "Cerca"
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
@@ -1428,8 +1474,8 @@ msgstr "Recenti:"
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entra"
 
@@ -1457,7 +1503,7 @@ msgstr "Minimizza automaticamente"
 msgid "Print status:"
 msgstr "Scrivi stato:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1492,34 +1538,53 @@ msgstr "<b>Impostazioni</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "Connessione HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Nome:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Tipo:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Usa autenticazione"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Porta:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Usa proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Usa autenticazione"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Nome utente:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1557,17 +1622,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Clicca per inserire un emoticon (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Invia"
 
@@ -1669,10 +1739,14 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Consentire notifiche/popup quando _assente/nd/occupato/invisibile."
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1687,21 +1761,21 @@ msgstr ""
 "Usa sempre le applicazioni predefinite XFCE4\n"
 "Personalizzate"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Verifica sempre se Gajim è il client Jabber _predefinito all'avvio"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Configura colore e tipo di carattere per l'interfaccia"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1710,34 +1784,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Mostra dettagli email _extra"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i _messaggi di stato dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1747,7 +1821,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono visualizzare nella finestra di chat."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1757,7 +1831,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al contatto."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1765,19 +1839,19 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1785,19 +1859,19 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1805,7 +1879,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1813,7 +1887,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro di lista "
 "contatti e chat di gruppo sotto il suo nome"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1821,7 +1895,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1829,7 +1903,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1837,14 +1911,14 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1855,14 +1929,14 @@ msgstr ""
 "spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
 "messaggi ricevuti da chi non è membro della lista contatti."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1871,7 +1945,7 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1881,13 +1955,13 @@ msgstr ""
 "(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1895,46 +1969,53 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Rendi compatta la finestra dei _messaggi"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Demone delle notifiche"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Mostra notifica per i contatti che si _connettono"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Mostra notifica per i contatti che si _disconnettono"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazioni personali"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1944,19 +2025,24 @@ msgstr ""
 "Mostra una notifica\n"
 "Mostra solo nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Mostra evento nell'area di notifica"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1964,144 +2050,148 @@ msgstr ""
 "Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
 "ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "_Icone di stato:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "In stallo"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Usa il sistema _predefinito"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Quando si riceve un nuovo evento:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "Notifica dello stato di chat in _entrata:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Evidenzia parole errate"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignora la formattazione dei messaggi ricevuti"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Messaggio in _arrivo:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Client di posta:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "_Non disponibile automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "Messaggio in _uscita:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "Notifica dello stato di chat in usci_ta:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entra in chat di _gruppo"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Non nei contatti"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minuti"
 
@@ -2149,7 +2239,7 @@ msgstr "ID Jabber"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Lista privacy"
 
@@ -2219,127 +2309,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Personalizzato</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Suoni</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Dipartimento:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Indirizzo extra:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Cognome:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "Nome completo"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Homepage:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Temi</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Nickname:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefono:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Condizioni</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Codice postale:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Privacy</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Suoni</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Impostazioni</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Impostazioni</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suoni</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "A proposito"
 
@@ -2349,17 +2439,17 @@ msgstr "Clicca per inserire l'avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Informazioni personali"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Lavoro"
 
@@ -2377,8 +2467,8 @@ msgstr "Rimuovi l'account da Gajim e dal _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Elimina"
 
@@ -2400,14 +2490,14 @@ msgstr "Modifica _gruppi..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_vita a "
 
@@ -2418,7 +2508,7 @@ msgstr "_Elimina"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Invia s_tato personalizzato"
 
@@ -2443,12 +2533,6 @@ msgstr "Inizia _chat"
 msgid "_Allow him/her to see my status"
 msgstr "Permetti di _vedere il mio stato"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr "_Blocca"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Proibisci di vedere il mio stato"
@@ -2470,17 +2554,35 @@ msgstr "_Rinomina..."
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr "_Sblocca"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "nove"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Aggiungi _contatto......"
@@ -2506,58 +2608,63 @@ msgid "Profile, A_vatar"
 msgstr "Profilo, a_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Mostra contatti _offline"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Mostra tras_porti"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Mostra lista _contatti"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Account"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_Domande frequenti"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "Invia _messaggio singolo..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Visualizza"
 
@@ -2574,11 +2681,11 @@ msgid "_Add contact"
 msgstr "_Aggiungi contatto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Cerca"
 
@@ -2665,11 +2772,6 @@ msgstr "Richiesta di abbonamento"
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-#, fuzzy
-msgid "Select the account with which to synchronise"
-msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
@@ -2694,10 +2796,6 @@ msgstr "Invia _messaggio singolo"
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi in attesa"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Mostra lista _contatti"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_to"
@@ -2717,54 +2815,59 @@ msgstr "<b>Azioni</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Impostazioni</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID Jabber: "
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risorsa:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Impostazioni</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Descrizione</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Commenti"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Avatar personalizzato:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Informazioni sul contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Ancora"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Avatar dell'utente:"
 
@@ -2776,6 +2879,11 @@ msgstr "<b>Traffico Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Inserimento XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Abilita"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2804,13 +2912,13 @@ msgstr "Assegna chiave Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Rinomina"
 
@@ -2834,31 +2942,27 @@ msgstr "Risorsa:"
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Modifica account"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informazioni sul contatto"
 
-#: ../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 ""
 
-#: ../src/adhoc_commands.py:304
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+msgid "Service sent malformed data"
+msgstr ""
+
+#: ../src/adhoc_commands.py:310
 #, fuzzy
 msgid "Service changed the session identifier."
 msgstr "Il client a %s ha annullato la negoziazione della sessione."
 
-#: ../src/adhoc_commands.py:317
-msgid "Service sent malformed data"
-msgstr ""
-
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr ""
 
@@ -2883,7 +2987,7 @@ msgstr "Intero"
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Colore"
 
@@ -2908,226 +3012,263 @@ msgstr "(Nessuna)"
 msgid "Hidden"
 msgstr "Nascosta"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Hai ricevuto un nuovo evento:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Inglese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Bielorusso"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretone"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Ceco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Tedesco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Greco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Britannico"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Basco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croato"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norvegese (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Olandese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polacco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brasiliano"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russo"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbo"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovacco"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Svedese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Il messaggio non può venire inviato finché non si è connessi."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "Sottolinea"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Servizio"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "_Carattere:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Informazioni sul contatto"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifratura attivata"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Non nei contatti"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
+
+#: ../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
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" di %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s della chat di gruppo %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usa autenticazione"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usa autenticazione"
@@ -3135,33 +3276,33 @@ msgstr "Usa autenticazione"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Utilizzo: /%s, pulisce la finestra di testo."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Utilizzo: /%s, nasconde i pulsanti di chat."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3170,67 +3311,67 @@ msgstr ""
 "Utilizzo: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Utilizzo: /%s, invia un ping al contatto"
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Utilizzo: /%s, invia il messaggio al contatto"
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3238,180 +3379,192 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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
 #, fuzzy
 msgid "Database Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 è un file ma dovrebbe essere una cartella"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 sta per uscire"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Modifica le informazioni sullo stato"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Modifica lo stato"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Imposta tipo di presenza e descrizione"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Libero per chat"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Assente a lungo"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Offline - disconnetti"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Descrizione della presenza:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Stato modificato."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Esci dalle chat di gruppo"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s su %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Scegliere le chat di gruppo da cui vuoi uscire"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Chat di gruppo"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Sei uscito dalle seguenti chat di gruppo:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Inoltra messaggi non letti"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Tutti i messaggi non letti sono stati inoltrati."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usa D-Bus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'assente'."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo in minuti dopo il quale lo stato diventa 'non disponibile'."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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 "predefinito"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Abilità la messaggistica zeroconf sulla rete locale"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Lingua usata dal controllo ortografico"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3421,7 +3574,7 @@ msgstr ""
 "'a volte' - scrive l'ora ogni print_ichat_every_foo_minutes minuti.\n"
 "'mai' - non scrive mai l'ora."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3431,18 +3584,18 @@ msgstr ""
 "o 0 per disabilitarlo. 1 è l'orologio più preciso, 4 è il meno preciso. "
 "Viene usato solo se print_time è 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Tratta le coppie di * / _ come possibili caratteri di formattazione."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Vero, non verranno rimossi */_ . Perciò *abc* verrà mostrato in grassetto "
 "ma senza rimuovere * *."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3451,7 +3604,7 @@ msgstr ""
 "Usa il testo annotato ReStructured per inviare HTML, più la formattazione "
 "ascii se selezionata (se si vuole usare questa opzione, installare docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3459,7 +3612,7 @@ msgstr ""
 "Carattere da aggiungere dopo il nickname quando si usa il completamento nick "
 "(tab) nella chat di gruppo."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3467,7 +3620,7 @@ msgstr ""
 "Carattere da proporre di aggiungere dopo il nickname desiderato quando il "
 "nickname desiderato è già usato da qualcun'altro nella chat di gruppo"
 
-#: ../src/common/config.py:161
+#: ../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 "
@@ -3478,19 +3631,19 @@ msgstr ""
 "la documentazione della funzione python strftime per ottenere documentazione "
 "completa: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Caratteri scritti prima del nickname nelle conversazioni"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Caratteri scritti dopo il nickname nelle conversazioni"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo della lista contatti?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3498,12 +3651,12 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quanti minuti devono durare le ultime linee dalla conversazione precedente."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3511,11 +3664,11 @@ msgstr ""
 "Inviare il messaggio con Ctrl-Invio e con Invio creare una nuova linea "
 "(comportamento predefinito del client ICQ Mirabilis)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quante linee memorizzare per Ctrl+Alto."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3524,12 +3677,12 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se marcato, Gajim può essere controllato da remoto usando gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3541,13 +3694,13 @@ msgstr ""
 "che sia sincronizzato con lo stato globale) basandosi sullo stato della "
 "connessione di rete."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notifiche di stato inviate. Può essere una tra all, composing_only, disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3555,7 +3708,7 @@ msgstr ""
 "Le notifiche di stato mostrate nella finestra di chat. Possono essere una "
 "tra all, composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3563,11 +3716,11 @@ msgstr ""
 "Quando non scrivi la data ad ogni messaggio (print_time==sometimes), "
 "scriverla ogni x minuti."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Chiedere prima di chiudere una finestra/scheda di chat di gruppo."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3575,7 +3728,7 @@ msgstr ""
 "Chiedere sempre prima di chiudere una finestra/scheda di chat di gruppo in "
 "questa lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3583,7 +3736,13 @@ msgstr ""
 "Non chiedere mai prima di chiudere una scheda/finestra di chat in questa "
 "lista separata da spazi di jid di stanze."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3593,35 +3752,27 @@ msgstr ""
 "interfacce locali, per il trasferimento file in caso di traslazione "
 "dell'indirizzo/inoltro porte."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Secondo lo standard IEC, KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Notifica gli eventi nell'area di notifica."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
-"registrazione dei messaggi?"
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3629,18 +3780,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Includere l'anteprima dei nuovi messaggi nelle notifiche popup?"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3649,13 +3800,13 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se Vero, Gajim controllerà se è il client Jabber predefinito ad ogni avvio."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3663,7 +3814,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà un icona su ogni scheda contenente messaggi non "
 "letti. A seconda del tema, questa icona può essere animata."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3671,11 +3822,11 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra dei contatti"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3683,7 +3834,7 @@ msgstr ""
 "Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3691,7 +3842,7 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3705,30 +3856,30 @@ msgstr ""
 "i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
 "entra od esce dalla chat di gruppo."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Colore di sfondo dei contatti appena collegati."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Colore di sfondo dei contatti appena scollegati."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Vero, i messaggi recuperati useranno un font più piccolo di quello "
 "predefinito."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Non mostrare l'avatar per il trasporto stesso."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Non mostrare l'account nella taskbar del sistema."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3738,7 +3889,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3749,7 +3900,7 @@ msgstr ""
 "SHA nella presenza sulle chat di gruppo"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3770,32 +3921,32 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Se Falso, l'avatar non verrà mostrato nella finestra di chat"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se Vero, premere il tasto Esc chiude una scheda/finestra"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Nasconde la lista dei presenti nella stanza nella finestra di chat di gruppo"
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3803,15 +3954,15 @@ msgstr ""
 "In una chat, mostra il nickname all'inizio della riga solo quando non è "
 "quello della persona che parlava nel messaggio precedente."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano nickname consecutivi."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3820,12 +3971,12 @@ msgstr ""
 "Lista di colori che saranno usati per colorare i nickname nelle chat di "
 "gruppo."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab va alla prossima scheda di composizione se nessuna è non letta."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3833,7 +3984,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:256
+#: ../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 "
@@ -3843,7 +3994,7 @@ msgstr ""
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3851,7 +4002,16 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
+"password degli account."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3859,7 +4019,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
 "degli account e dei gruppi."
 
-#: ../src/common/config.py:259
+#: ../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"
@@ -3867,7 +4027,7 @@ msgstr ""
 "Può essere vuoto, 'chat' o 'normal'. Se non vuoto, tratta tutti i messaggi "
 "in iarrivo come se fossero di questo tipo"
 
-#: ../src/common/config.py:260
+#: ../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."
@@ -3875,7 +4035,7 @@ msgstr ""
 "Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
 "messaggio, se la finestra di chat non è già aperta."
 
-#: ../src/common/config.py:261
+#: ../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."
@@ -3883,13 +4043,13 @@ msgstr ""
 "Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
 "usando dvips e convertendola prima di inserirla in una finestra di chat."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Tempo di inattività richiesto prima che la finestra di cambiamento del "
 "messaggio di stato si chiuda."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3897,29 +4057,35 @@ msgstr ""
 "Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
 "più vecchie verranno cancellate."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../src/common/config.py:260
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../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."
@@ -3927,60 +4093,68 @@ msgstr ""
 "La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
 "definite nelle opzioni autopriority_*."
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3988,119 +4162,127 @@ msgstr ""
 "Se marcato, Gajim userà l'IP della macchina ed i proxy definiti nell'opzione "
 "file_transfer_proxies per il trasferimento file."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
+"registrazione dei messaggi?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "tutto o stati separati da uno spazio"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', o 'both'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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' o 'both'"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4108,149 +4290,179 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Host errato"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Indirizzo locale non valido? :-O"
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "La vCard è stata pubblicata correttamente"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Migrazione GUI fallita"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Errore di scrittura su disco"
 
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "ID Jabber non valido"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname non permesso: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sei stato bandito dalla stanza %s."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "La stanza %s non esiste."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "La stanza è stata cancellata"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puoi invece entrare in questa stanza: %s"
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4261,251 +4473,256 @@ msgstr ""
 "rimuoverlo"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Ti connetterai a %s senza OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 #, fuzzy
 msgid "CRL is not yet valid"
 msgstr "%s non è un livello di log valido"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome utente non valido"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il server %s ha risposto in maniera errata alla richiesta di registrazione: %"
 "s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Il trasporto %s ha risposto in maniera errata alla richiesta di "
 "registrazione: %s"
 
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Connessione al proxy fallita"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Memorizzato in: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Connessione al proxy fallita"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4514,26 +4731,31 @@ msgstr ""
 "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
 "risorse connesse. Disattivarla e riprovare."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Non è possibile inviare file vuoti"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4542,19 +4764,30 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "_Gestisci contatti"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Osservatori"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Trasporti"
 
@@ -4563,11 +4796,11 @@ msgid "Not in roster"
 msgstr "Non nei contatti"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "I binding python per D-Bus sono mancanti su questo computer"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Le potenzialità D-Bus di Gajim non possono essere usate"
 
@@ -4600,1118 +4833,1128 @@ msgstr ""
 "Il bus di sessione non è disponibile.\n"
 "Provare a leggere http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dodici"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "uno"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "due"
 
-#: ../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 "quattro"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "cinque"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "sei"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sette"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "otto"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nove"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dieci"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "undici"
 
+#. 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 "dodici"
-
-#. 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 in punto"
+msgid "%(0)s o'clock"
+msgstr "%(0)s in punto"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 e cinque"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s e cinque"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 e dieci"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s e dieci"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 e un quarto"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s e un quarto"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 e venti"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s e venti"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 e venticinque"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s e venticinque"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 e mezza"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s e mezza"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "$0 e trentacinque"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "%(0)s e trentacinque"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "venti alle $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "venti alle %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "un quarto alle $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "un quarto alle %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "dieci alle $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "dieci alle %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "cinque alle $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "cinque alle %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 in punto"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s in punto"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Notte"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Mattino presto"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Mattino"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Quasi mezzogiorno"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Mezzogiorno"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Pomeriggio"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Sera"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Tarda sera"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Inizio della settimana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Metà settimana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Fine settimana"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Fine settimana!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuna"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "sta scrivendo..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d messaggio in attesa"
 msgstr[1] "%d messaggi in attesa"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " dalla stanza %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " dall'utente %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " da %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento in attesa"
 msgstr[1] "%d eventi in attesa"
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s non è un livello di log valido"
+
 #. 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 "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Account Gajim %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "dell'account %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "In pausa"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Grassetto"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Ho "
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Chat"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Grassetto"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Contenuti"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completato"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Contenuti"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Disattivato"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Elimina"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Disconnesso"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Disabilitato"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Disabilitato"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 #, fuzzy
 msgid "Envious"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Excited"
 msgstr "Attivato"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Gruppo"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "messaggio"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Attivato"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisibile"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "uno"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Tedesco"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Modifica"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 #, fuzzy
 msgid "Nervous"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Gruppo"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "undici"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "In stallo"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Ultima modifica:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Serious"
 msgstr "_Precedente"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Nickname"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Dormo"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Via:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Abbonati"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "Sottolinea"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Host errato"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Sera"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Scrivendo"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Mattino"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "a tutti nel gruppo"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Sera"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Sto cacciando %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entra"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "stanza"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Cambio oggetto"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Sto cacciando %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Relaxing"
 msgstr "semplice"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Sto cacciando %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Disconnessione"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Motivo"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Dormo"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Sto guardando un film."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Mangio"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Sono al telefono."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Trasferimento in corso"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Scrivendo"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "On a Plane"
 msgstr "Online"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Apri come _Link"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Scrivendo"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Lavoro"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Non è possibile fare il bind alla porta %s"
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5720,20 +5963,13 @@ msgstr ""
 "file verrà annullato."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"La connessione all'host non può esser stabilita: Tempo scaduto durante "
-"l'invio di dati."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5742,16 +5978,16 @@ msgstr ""
 "L'host %s che hai configurato come il ft_add_hosts_to_send opzione non è "
 "valida, perciò sarà ignorato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Per continuare a mandare e ricevere messaggi, è necessario riconnettersi."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Errore avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5760,32 +5996,32 @@ msgstr ""
 "%s\n"
 "La messaggistica sulla rete locale potrebbe non funzionare correttamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Controllare se Avahi è installato."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Impossibile avviare il servizio locale"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossibile collegarsi alla porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossibile cambiare lo stato dell'account  \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5794,63 +6030,53 @@ msgstr ""
 "essere inviato."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Il contatto è offline. Il tuo messaggio non può esser inviato."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"La connessione all'host non può esser stabilita: Tempo scaduto durante "
+"l'invio di dati."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Errore durante la creazione del servizio. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Attivo"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Evento"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Messaggi di stato preimpostati"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Abilita"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Personalizzato</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5859,258 +6085,216 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Primo messaggio ricevuto"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Prossimo messaggio ricevuto"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Prossimo messaggio ricevuto"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Contatto connesso"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Contatto disconnesso"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Messaggio inviato"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Evidenziatura messaggi in chat di gruppo"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Messaggio ricevuto in chat di gruppo"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Email GMail ricevuta"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Nome"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Se si vogliono applicare subito i cambiamenti, è necessario effettuare un "
 "nuovo login."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Tutte le finestre di chat e le chat di gruppo saranno chiuse. Desideri "
 "continuare?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Per cambiare nome account, è necessario leggere tutti gli eventi in attesa."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Questo nome è già usato da un altro account. Scegliere un altro nome."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber non valido"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "È necessario creare un nuovo account prima di poter modificare le "
 "informazioni personali."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Non si è connessi al server"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Per favore rinominalo o rimuovilo prima di abilitare la messaggistica sulla "
 "rete locale."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6118,11 +6302,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6130,11 +6314,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6142,11 +6326,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6154,14 +6338,15 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Può essere uno dei seguenti:\n"
 "1. utente@dominio/risorsa (corrisponde solo agli indirizzi con la risorsa "
@@ -6171,85 +6356,90 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Controllare di avere compilato i campi server e stanza, o eliminare questo "
 "segnalibro."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
-msgstr "Nome utente non valido"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Nickname non valido"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "È necessario inserire un nome utente per configurare questo account."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Nickname non permesso: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "ID Jabber duplicato"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Server non valido"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Questo account è già configurato in Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Voce non valida"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6259,25 +6449,33 @@ msgstr ""
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3137
-msgid "Invalid server"
-msgstr "Server non valido"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Nome utente non valido"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "È necessario inserire un nome utente per configurare questo account."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6287,7 +6485,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6295,30 +6493,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Il nuovo account è stato creato con successo"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Attivo"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Evento"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Primo messaggio ricevuto"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Prossimo messaggio ricevuto"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Prossimo messaggio ricevuto"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Contatto connesso"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Contatto disconnesso"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Messaggio inviato"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Evidenziatura messaggi in chat di gruppo"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Messaggio ricevuto in chat di gruppo"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Email GMail ricevuta"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6327,75 +6567,75 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Esci"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Client IM Jabber"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6410,140 +6650,140 @@ msgstr "Nome contatto: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "ID Jabber: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "Nel gruppo"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nome contatto"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Messaggio di stato %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Sovrascrivere messaggio di stato?"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Questo nome è già stato utilizzato. Vuoi sovrascrivere questo messaggio di "
 "stato?"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Salva come messaggio di stato predefinito"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Inserire un nome per questo messaggio di stato"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Indirizzo AIM:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Numero GG:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Numero ICQ:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Indirizzo MSN:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Indirizzo Yahoo!:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Inserire i dati del contatto che si vuole aggiungere all'account %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Inserire i dati del contatto che si vuole aggiungere"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Dulcis in fundo, ringraziamo tutti i gestori dei pacchetti"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -6551,7 +6791,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6564,365 +6804,391 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Il nickname contiene caratteri non consentiti."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Non è possibile unirsi a chat di gruppo quando non si è connessi."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nickname non valido"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-msgid "The nickname has not allowed characters."
-msgstr "Il nickname contiene caratteri non consentiti."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non è il nome di una chat di gruppo"
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Non puoi sincronizzarti con un account a meno che non sia connesso."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
 msgstr "Introdurre il nickname o l'ID del contatto con cui chattare:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Trasferimento file completato"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr " da %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2568
+#. 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 "Vorrei aggiungerti alla mia lista contatti."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Indirizzo"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Modifica"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "ID Jabber: "
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Gruppo"
+
+#. 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 "Vorrei aggiungerti ai miei contatti."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordine: %s, azione: %s, tipo: %s, valore: %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ti ha invitato alla chat di gruppo %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi inviare questo file a %s:"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6930,39 +7196,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Verifica l'identità del client remoto"
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6972,59 +7238,59 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Altri"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7032,240 +7298,263 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Server non valido"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Esegui comando"
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "Segnalibro già impostato"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "La stanza \"%s\" è già tra i segnalibri."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Il segnalibro è stato aggiunto con successo"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
+"della lista contatti."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
+msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Una libreria usata per validare i certificati del server per assicurare una "
 "connessione sicura."
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Richiede python-pyopenssl."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour/Zeroconf"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Sistema di chat senza server con i client rilevati automaticamente nella "
 "rete locale."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Richiede python-avahi."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Richiede pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Comandi: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 #, fuzzy
 msgid "A script to control Gajim via commandline."
 msgstr "Uno script per controllare gajim dalla riga di comando."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Richiede python-dbus."
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 "Caratteristica non disponibile sotto Windows."
 
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenGPG"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Cifratura OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Cifratura dei messaggi di chat con le chiavi gpg."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Richiede gpg e python-GnuPGInterface"
 
-#: ../src/features_window.py:67
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "Gestore connessione"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Riconoscimento automatico dello stato della connessione."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Richiede gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Gestore sessioni"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "La sessione di Gajim viene salvata alla chiusura e ripristinata all'avvio."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Richiede python-gnome2."
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "Gestore portachiavi"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Le password non coincidono"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "Le password possono essere salvate in modo sicuro e non in un semplice file "
 "di testo."
 
-#: ../src/features_window.py:77
-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 "Richiede gnome-keyring e python-gnome2-desktop."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 #, fuzzy
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Possibilità di connettersi ai server che usano record SRV."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Richiede dnsutils."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Richiede nslookup per usare i record SRV."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Correttore ortografico"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Correzione ortografica dei messaggi."
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Richiede python-gnome2-extras o la compilazione del modulo gtkspell dai "
-"sorgenti di Gajim."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Richiede python-dbus."
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
 msgstr "Demone delle notifiche"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Popup passivi che notificano nuovi eventi."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "Richiede python-notify, oppure python-dbus e notification-daemon."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Icona nell'area di notifica"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Un'icona nell'area di notifica che riflette lo stato attuale."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 #, fuzzy
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
@@ -7273,34 +7562,40 @@ msgstr ""
 "Richiede python-gnome2-extras oppure la compilazione del modulo trayicon dai "
 "sorgenti di Gajim."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Richiede PyGTK >= 2.10."
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "Inattivatore"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Modifica lo stato"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Possibilità di misurare il tempo di inattività, per poter cambiare lo stato "
 "automaticamente."
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Richiede la compilazione del modulo idle dai sorgenti di Gajim."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
+msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Richiede python-gnome2."
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 #, fuzzy
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Trasforma le espressioni LaTeX comprese in $$ $$."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:96
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
@@ -7309,7 +7604,7 @@ msgstr ""
 "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
 "su Attivato nell'Editor di configurazione avanzata."
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:97
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
@@ -7318,25 +7613,26 @@ msgstr ""
 "Richiede texlive-latex-base, dvips e imagemagick. Devi impostare 'use_latex' "
 "su Attivato nell'Editor di configurazione avanzata."
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Attiva cifratura end-to-end"
 
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Cifratura dei messaggi di chat."
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Richiede python-crypto."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Generatore RST"
 
-#: ../src/features_window.py:108
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7344,24 +7640,24 @@ msgstr ""
 "Genera output XHTML a partire da codice RST (vedi http://docutils."
 "sourceforge.net/docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Richiede python-docutils."
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 #, fuzzy
 msgid "Requires python-sexy."
 msgstr "Richiede python-dbus."
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Funzione"
 
@@ -7390,7 +7686,7 @@ msgstr "Dimensione: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Tu"
 
@@ -7400,7 +7696,7 @@ msgid "Sender: %s"
 msgstr "Mittente: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -7432,27 +7728,28 @@ msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Trasferimento file fermato dal contatto dall'altra parte"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Trasferimento file fermato"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
@@ -7472,12 +7769,12 @@ msgstr "Descrizione: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Non è possibile sovrascrivere il file esistente \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
@@ -7485,22 +7782,22 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Cosa fare?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
@@ -7536,49 +7833,53 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s non è un livello di log valido"
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:186
-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 ha bisogno di PyGTK 2.8 o superiore"
 
-#: ../src/gajim.py:187
-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 ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:189
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim ha bisogno di GTK2.8 o superiore"
 
-#: ../src/gajim.py:190
-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 ha bisogno di GTK2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7587,20 +7888,20 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di pywin32 per essere eseguito"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7610,11 +7911,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7622,25 +7923,34 @@ msgstr ""
 "Un'altra istanza di Gajim sembra essere in esecuzione\n"
 "Continuare comunque?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Inserire la passphrase della chiave GPG per l'account %s."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Ti connetterai a %s senza OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Riscrivere la passphrase GPG o premere Annulla."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7651,150 +7961,190 @@ msgstr ""
 "chat di gruppo %s.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/gajim.py:571
+#: ../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 "Accettare questa richiesta?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Richiesta di abbonamento"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Il contatto \"%s\" ti ha autorizzato a vedere il suo stato."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "Disa_bbonati"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 è ora %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "la stanza ora non mostra i membri non disponibili"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "E' stata effettuata una modifica alla configurazione della stanza che non "
 "riguarda la privacy"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "La registrazione dei messaggi della stanza è stata disattivata"
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "La stanza è ora completamente anonima"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "È necessaria una password per entrare nella stanza %s. Inserisci la password"
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "Non è possibile utilizzare GPG"
+
+#: ../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: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 "_Non chiederlo più"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring è installato ma non avviato correttamente (la variabile "
+"d'ambiente è probabilmente impostata in maniera non corretta)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "C'è %d nuova conversazione in e-mail"
 msgstr[1] "Ci sono %d nuove conversazioni in e-mail"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7804,82 +8154,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Elimina il contatto dalla lista"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Errore leggendo il file:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s ricevuto con successo da %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Invio di %(filename)s a %(name)s effettuato con successo."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "In tutti i _messaggi"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Errore."
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7887,178 +8247,155 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Connessione"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "_Non chiederlo più"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Segnalibro già impostato"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "La stanza \"%s\" è già tra i segnalibri."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Il segnalibro è stato aggiunto con successo"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"È possibile gestire i segnalibri attraverso il menu Azioni nella finestra "
-"della lista contatti."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Mostra un aiuto su di un comando specifico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostra aiuto sul comando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Apre una finestra con il prossimo evento in attesa"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostra solo i contatti dell'account dato"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Scrive un elenco degli account registrati"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Cambia lo stato degli account"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "stato"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "messaggio"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "messaggio di stato"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8067,20 +8404,24 @@ msgstr ""
 "cambiare lo stato di tutti gli account che hanno marcato l'opzione "
 "\"sincronizza con lo stato globale\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Mostra la finestra di chat per mandare messaggi ad un contatto"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID del contatto con cui si vuole chattare"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se specificato, il contatto è preso dalla lista contatti di questo account"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8090,30 +8431,30 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID del contatto che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "chiave pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "se specificato, il messaggio verrà cifrato usando questa chiave pubblica"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se specificato, il messaggio verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8123,138 +8464,138 @@ msgstr ""
 "OpenPGP che l'account sono opzionali. Se si vuole impostare solo 'account', "
 "senza 'chiave OpenPGP', impostare 'chiave OpenPGP' a ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "oggetto"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "oggetto del messaggio "
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Invia nuovi messaggi alla chat di gruppo in cui sei entrato."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID della stanza che riceverà il messaggio"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID del contatto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Ottiene informazioni dettagliate su un contatto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Nome dell'account"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Invia file ad un contatto"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Percorso file"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se specificato, il file verrà inviato usando questo account"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Mostra tutte le preferenze ed i relativi valori"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Imposta il valore di 'chiave' a 'valore'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chiave' è il nome della preferenza, 'valore' è il valore a cui impostarla"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Elimina un oggetto dalle preferenze"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "chiave"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome della preferenza da eliminare"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Scrive lo stato corrente delle preferenze di Gajim nel file .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Aggiunge il contatto alla lista"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Aggiunge un nuovo contatto a questo account"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Restituisce lo stato corrente (quello globale se non è specificato un "
 "account)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Restituisce il messaggio di stato corrente (quello globale se non è "
 "specificato un account)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Restituisce il numero di messaggi non letti"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Apre la finestra di inizio chat"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Inizia chat usando questo account"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Invia XML personalizzato"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML da inviare"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8262,74 +8603,79 @@ msgstr ""
 "L'account al quale l'xml è inviato; se non specificato, l'xml sarà spedito a "
 "tutti gli account."
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Gestisci un uri xmpp:/"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 #, fuzzy
 msgid "Account in which you want to handle it"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "contenuti messaggi"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "stanza"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Stanza:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Le password non coincidono"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 #, fuzzy
 msgid "Account from which you want to enter the room"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8338,31 +8684,31 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8371,7 +8717,7 @@ msgstr ""
 "Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8380,7 +8726,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8389,7 +8735,7 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "URI errato"
 
@@ -8406,175 +8752,179 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Creare un nuovo tema con il nome desiderato."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nome del tema"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Non è possibile eliminare il tema corrente"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Cronologia conversazione"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Connessione"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Il server ha assegnato o modificato il tuo nickname"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s è stato bloccato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../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 è stato cacciato dalla stanza (%(reason)s)"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s è stato cacciato da %(who)s : %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-msgid "Invalid nickname"
-msgstr "Nickname non valido"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Questa stanza non ha oggetto"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Nickname non trovato: %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 ""
 "Utilizzo: /%s <nickname|JID> [motivo], bandisce il JID dalla stanza. Il "
 "nickname di un partecipante può venire usato al posto del JID, ma non se "
 "contiene \"@\". Se il JID è correntemente nella stanza, verrà anche "
 "cacciato. NON supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8583,7 +8933,7 @@ msgstr ""
 "Utilizzo: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8592,7 +8942,7 @@ msgstr ""
 "Utilizzo: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8601,7 +8951,7 @@ msgstr ""
 "Utilizzo: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8610,18 +8960,17 @@ msgstr ""
 "Utilizzo: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare "
 "in stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Utilizzo: /%s <nickname> [motivo], rimuove il partecipante specificato per "
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8630,27 +8979,27 @@ msgstr ""
 "Utilizzo: /%s <nickname> [messaggio], apre una finestra di messaggi privati "
 "ed invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
 "corrente."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Utilizzo: /%s [argomento], mostra o aggiorna l'argomento della stanza "
 "corrente."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8658,39 +9007,54 @@ msgstr ""
 "Utilizzo: /%s <messaggio>, invia un messaggio senza considerare gli altri "
 "comandi."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 ""
+"Utilizzo: /%s <nickname>, cambia il tuo nickname nella stanza corrente."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8698,22 +9062,22 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -8744,84 +9108,84 @@ msgstr "Dettagli"
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Errore processando il file:"
 
 #. 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 ""
 "Non si è potuto scrivere su %s. Il supporto gestione sessioni non funzionerà"
 
 #. 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 non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../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 "Verifica sempre se Gajim è il client Jabber predefinito all'avvio"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../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 ""
 "L'immagine non può essere salvata in formato %(type)s. Salvarla come %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contatti"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Ripulire il database? (FORTEMENTE SCONSIGLIATO SE GAJIM È IN ESECUZIONE)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8835,16 +9199,16 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s alle %(time)s ha detto: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] ""
@@ -8852,158 +9216,168 @@ msgstr[0] ""
 msgstr[1] ""
 "Si vuole davvero eliminare la cronologia per i contatti selezionati?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:585
+#: ../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] "Si vuole davvero eliminare il messaggio selezionato?"
 msgstr[1] "Si vogliono davvero eliminare i messaggi selezionati?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Cronologia conversazione con %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 #, fuzzy
 msgid "Disk Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s ora è %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Non si è connessi al server"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Si vuole davvero eliminare il messaggio selezionato?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Messaggi"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr "- i messaggi saranno registrati"
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr "- i messaggi non saranno registrati"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s connesso"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s disconnesso"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuovo messaggio privato dalla stanza %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 "Messaggio inviato da %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Generale"
+msgid "Ignore"
+msgstr "nove"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Informazioni ricevute"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Invio del profilo..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Informazione NON pubblicata"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9011,55 +9385,46 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1920
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring è installato ma non avviato correttamente (la variabile "
-"d'ambiente è probabilmente impostata in maniera non corretta)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Si sta partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9067,15 +9432,28 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Si è sicuri di voler uscire dalle stanze \"%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 "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9084,16 +9462,16 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9101,11 +9479,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9115,52 +9493,57 @@ msgstr ""
 "trasporti:%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Elimina anche tutti i contatti di questo gruppo dalla lista"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9169,12 +9552,12 @@ msgstr ""
 "ti vedrà sempre offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Cosa fare?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9182,16 +9565,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9200,20 +9583,20 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter chattare con altri contatti."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9222,12 +9605,12 @@ msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni metacontatti. "
 "Perciò queste informazioni non saranno salvate al prossimo riavvio."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Stai per creare un metacontatto. Continuare?"
 
-#: ../src/roster_window.py:3786
+#: ../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 "
@@ -9237,143 +9620,144 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "File non valido"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "Vuoi inviare questo file a %s:"
 msgstr[1] "Vuoi inviare questi file a %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Invia %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Rendi %s e %s metacontatti"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "usando l'account %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Gestione segnalibri..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Attivo"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Configura la _stanza..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Utenti _online"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Gestisci contatti"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Invia messaggio singolo"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Gestisci trasporto"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modifica trasporto"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
@@ -9390,21 +9774,21 @@ msgstr "Errore nella ricezione dei dati"
 msgid "No result"
 msgstr "Nessun risultato"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 #, fuzzy
 msgid "Disk WriteError"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Oggetto: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Conferma queste opzioni di sessione"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9419,7 +9803,7 @@ msgstr ""
 "\n"
 "\tQueste opzioni sono accettabili?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9434,127 +9818,117 @@ msgstr ""
 "\n"
 "Continuare la sessione?"
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../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 di questa chat di gruppo"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [bloccato]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimizzata]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " dalle %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Stanza:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Attivato"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../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"
@@ -9570,17 +9944,22 @@ msgstr "?Client:Sconosciuto"
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Client:Sconosciuto"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "dalle %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Applicazioni</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9588,7 +9967,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9596,14 +9975,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tu ed il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9611,21 +9990,103 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sei in attesa della risposta del contatto alla tua richiesta di abbonamento"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Cifratura OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Clicca per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
+
+#~ msgid "Servers Features"
+#~ msgstr "Servizi del server"
+
+#~ msgid "Your JID:"
+#~ msgstr "Il tuo JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Mostra lista _contatti"
+
+#, fuzzy
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
+
+#~ msgid "Modify Account"
+#~ msgstr "Modifica account"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" di %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Account Gajim %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Personalizzato</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "ID Jabber duplicato"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Questo account è già configurato in Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenGPG"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "Gestore portachiavi"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Richiede python-gnome2-extras o la compilazione del modulo gtkspell dai "
+#~ "sorgenti di Gajim."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Demone delle notifiche"
+
+#~ msgid "Idle"
+#~ msgstr "Inattivatore"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Richiede la compilazione del modulo idle dai sorgenti di Gajim."
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Trasferimento file fermato dal contatto dall'altra parte"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Generale"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Attivo"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr ""
@@ -9751,18 +10212,9 @@ msgstr " risorsa con priorità "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "Controllo notifiche _avanzato..."
 
-#~ msgid "_Font:"
-#~ msgstr "_Carattere:"
-
 #~ msgid "_Player:"
 #~ msgstr "_Riproduttore:"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
-#~ msgid "Address"
-#~ msgstr "Indirizzo"
-
 #~ msgid "City:"
 #~ msgstr "Città:"
 
@@ -9988,9 +10440,6 @@ msgstr " risorsa con priorità "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Ripetere password:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Usa proxy"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -10060,9 +10509,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Sposta %s nel gruppo %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Rendi %s e %s metacontatti"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Nasconde i pulsanti nella finestra di chat a due persone"
 
@@ -10168,9 +10614,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nome della stanza o del server non valido"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "La vCard è stata pubblicata correttamente"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Le informazioni personali sono state pubblicate con successo."
 
@@ -10225,9 +10668,6 @@ msgstr " risorsa con priorità "
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s ti ha inviato un nuovo messaggio."
 
-#~ msgid "GUI Migration failed"
-#~ msgstr "Migrazione GUI fallita"
-
 #~ msgid ""
 #~ "Logs migration through graphical interface failed. The migration process "
 #~ "will start in the background. Please wait a few minutes for Gajim to "
@@ -10306,9 +10746,6 @@ msgstr " risorsa con priorità "
 #~ msgid "account: "
 #~ msgstr "account: "
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "Chiudendo questa finestra, si verrà disconnessi da queste stanze."
 
@@ -10462,9 +10899,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Allow controlling Gajim via D-Bus service."
 #~ msgstr "Permettere il controllo di Gajim attraverso il servizio D-Bus."
 
-#~ msgid "Service"
-#~ msgstr "Servizio"
-
 #~ msgid ""
 #~ "Your new account has been created and added to your gajim configuration.\n"
 #~ "You can set advanced account options using \"Edit->Accounts\" in the main "
diff --git a/po/lt.po b/po/lt.po
index 2934f1c44..40b691a58 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,16 +1,16 @@
 # Lithuanian translations for Gajim - A Jabber Instant Messager package.
 # Copyright (C) 2006 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
-# Mantas Zimnickas <sirexas@yahoo.com>, 2007.
 #
+# Mantas Zimnickas <sirexas@yahoo.com>, 2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2007-01-21 15:27+1100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
-"Language-Team: Lithuanian\n"
+"Language-Team: Lithuanian <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,7 +39,7 @@ msgid "_Add Contact..."
 msgstr "_Įtraukti asmenį..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Ieškoti Paslaugų"
 
@@ -62,7 +62,7 @@ msgid "_Personal Events"
 msgstr "Asmeninė Informacija"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Pradėti pokalbį"
@@ -97,66 +97,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Jabber serverių paslaugų sąrašas (tokių, kaip: MSN, ICQ pernašos)"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Naudoti autentifikaciją"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Prisijungti, kai paspausiu Baigti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Prieigos kūrimo vedlys"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Jau turiu prieigą, kurią noriu naudoti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Noriu už_registruoti naują prieigą"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Valdyti..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proksis:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Išsaugoti _slaptažodį"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Serverio teikiamos paslaugos"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Nustatyti mano profilį, kai prisijungsiu"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
@@ -169,31 +168,32 @@ msgstr ""
 "Jabber tinkle."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Jūsų JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Papildomas"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Baigti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Serverio adresas: "
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Portas:"
 
@@ -201,11 +201,6 @@ msgstr "_Portas:"
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Naudotojo vardas:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -214,18 +209,16 @@ msgstr "<b>Įvairūs</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Asmeninė informacija</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Prieiga"
 
@@ -234,24 +227,23 @@ msgid "Account Modification"
 msgstr "Prieigos keitimas"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Administrator List"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatiškai bandyti prisijungti, kai prarandamas ryšys"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Prisijungti, kai Gajim pasileis"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "_Keisti slaptažodį"
 
@@ -267,37 +259,35 @@ msgstr ""
 "serveris užklausia ir jei ši parinktis yra aktyvi, TLS bus deaktyvuotas"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Pasirinkite _Raktą..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Spauskite, kad pakeisti prieigos slaptažodį"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Prisijungimas"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Keisti asmeninę informaciją..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -305,17 +295,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Bendros parinktys"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Serverio adresas: "
 
@@ -338,7 +325,6 @@ msgstr ""
 "ryšys, dėl ko gali įvyksta savaiminiai atsijungimai"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -348,7 +334,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -358,7 +343,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -373,43 +357,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Raktas nepasirinktas"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Joks"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Prievadas: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "_Prioritetas:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -420,7 +406,7 @@ msgstr ""
 "prieigos; Klientas, turintis aukščiausią prioritetą gaus pranešimus"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritetas keisis automatiškai, priklausomai nuo jūsų būklės."
 
@@ -429,12 +415,12 @@ msgid "Proxy:"
 msgstr "Proksis:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Šal_tinis:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -449,30 +435,25 @@ msgstr ""
 "turi didžiausią prioritetą gaus visus pranešimus. (žiūrėkite žemiau)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Išsaugoti _slaptafrazę (nesaugu)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Saugoti visų asmenų pokalbių žurnalus"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Siųsti „aš-gyvas“ paketus"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -483,21 +464,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Naudoti _SSL (legacy)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Naudoti failų siuntimo proksius"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Nustatyti būklei"
 
-#: ../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:13
 msgid "_Name:"
 msgstr "_Pavadinimas:"
 
@@ -506,31 +482,38 @@ msgstr "_Pavadinimas:"
 msgid "<b>Proxy</b>"
 msgstr "<i>Privatus Sąrašas</i>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Nustatyti būklei"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Prieiga"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Naudoti autentifikaciją"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Prisijungti, kai Gajim pasileis"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "El. paštas:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Įjungti"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Vardas:"
 
@@ -540,7 +523,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -551,56 +533,96 @@ msgstr ""
 "Turėtumėte pakeisti leistinus ugniasienės nustatymus."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Pavardė:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Apjun_gti prieigas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Pe_rvadinti"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Siųsti „aš-gyvas“ paketus"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Naudoti parinktą serverio adresą/prievadą"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Use custom port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Keisti asmeninę informaciją..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Įjungti"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Serverio adresas: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Valdyti..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Portas:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Prieiga:"
@@ -789,7 +811,7 @@ msgid "All statuses"
 msgstr "Visos būklės"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Manęs nėra"
 
@@ -806,7 +828,7 @@ msgid "Have "
 msgstr "Turiu "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Nematomas"
 
@@ -815,7 +837,7 @@ msgid "Launch a command"
 msgstr "Paleisti komandą"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
@@ -936,7 +958,7 @@ msgstr "Paskutinį kartą keista:"
 msgid "New entry received"
 msgstr "Gautas naujas įrašas"
 
-#: ../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 "Jūs gavote naują įrašą:"
 
@@ -984,11 +1006,21 @@ msgstr "Įveskite naują slaptažodį:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Įveskite naują būklės žinutę</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Activated"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Kambarys:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Nustatytos žinutės:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Išsaugoti kaip nustatytą..."
 
@@ -1051,11 +1083,11 @@ msgstr "Įtr_aukti į kontaktų sąrašą"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Istorija"
 
@@ -1165,7 +1197,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Rodyti pranešimą iššokstančiame lange, kai failo siuntimas baigsis  "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Tęsti"
 
@@ -1201,7 +1233,7 @@ msgstr ""
 "Asmens eilutė\n"
 "Pokalbio paveiksliukas"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Paryškintas"
 
@@ -1221,11 +1253,11 @@ msgstr "Gajim temų keitimas"
 msgid "Gone"
 msgstr "Dingo"
 
-#: ../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 "Neaktyvus"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Pasviręs"
 
@@ -1276,7 +1308,7 @@ msgstr "Keisti _temą"
 msgid "Configure _Room..."
 msgstr "Keisti kambario nustatymus"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Žy_mėti šį kambarį"
@@ -1311,23 +1343,37 @@ msgstr "_Adminas"
 msgid "_Ban"
 msgstr "_Banas"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Išspirti"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Dalyvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Savininkas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Siųsti privačią žinutę"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Balsas"
 
@@ -1335,13 +1381,13 @@ msgstr "_Balsas"
 msgid "Create new post"
 msgstr "Kurti naują pranešimą"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Nuo"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tema"
 
@@ -1365,7 +1411,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim Istorijos Žurnalų Valdymas"
 
-#: ../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 "Trinti"
 
@@ -1390,7 +1437,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Paieška duomenų bazėje"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Pokalbio istorija"
 
@@ -1411,7 +1458,7 @@ msgstr "Ieškoti"
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istoriją"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
@@ -1438,8 +1485,8 @@ msgstr "Nesenai:"
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Jungtis"
 
@@ -1467,7 +1514,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Rodyti būklę:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Serveris:"
 
@@ -1502,32 +1549,51 @@ msgstr "<b>Nustatymai</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "HTTP jungimąsis"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Proxi profilių valdymas"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Pavadinimas:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Slaptažodis:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Tipas:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proksis:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Naudoti autentifikaciją"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Portas:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Hostas:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Naudoti proksi"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Naudoti autentifikaciją"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipas:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Naudotojo vardas:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1565,17 +1631,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Įterpti emocijų paveiksliuką (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Įterpti emocijų paveiksliuką (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "_Siųsti"
 
@@ -1681,10 +1752,14 @@ msgstr ""
 "Leisti pop-up/informavimą, kai esu _nuėjęs/nepasiekamas/užimtas/namatomas"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1699,21 +1774,21 @@ msgstr ""
 "Visada naudoti XFCE4 programas pagal nutylėjimą\n"
 "Kita"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Startuojant visada tikrinti ar Gajim yra pagrindinis Jabber klientas"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Nustatyti sąsajos spalvą ir šriftą"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1722,34 +1797,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Rodyti papildomus _el. pašto duomenis"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1759,7 +1834,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę rodyti pokalbių languose."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1769,7 +1844,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę išsiųsti kitai šaliai."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1777,37 +1852,37 @@ msgstr ""
 "Gajim rodys pranešimus apie ką tik atsijungusius asmenis iššokančiame "
 "langelyje, dešiniajame apatiniame ekrano kampe"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Hides the buttons in group chat window."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Jei pažymėta, Gajim, startuodamas jungsis prie šio pokalbio grupėje"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1815,7 +1890,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1823,7 +1898,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
 "kontaktų sąraše ir pokalbių grupėse"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1831,7 +1906,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1839,7 +1914,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1847,14 +1922,14 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1865,14 +1940,14 @@ msgstr ""
 "jums nepageidaujamas žinutes. Naudokite atsargiai, nes šis dalykas blokuos "
 "vias žinutes, siunčiamas iš žmonių, kurie nėra Jūsų kontaktų sąraše."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -1880,7 +1955,7 @@ msgid ""
 msgstr ""
 "Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1890,13 +1965,13 @@ msgstr ""
 "(pvz.: asmuo iš MSN protokolo turės atitinkamą MSN paveiksliuką būklei "
 "„prisijungęs“, „nuėjęs“, „užimtas“ atvaizduoti... )"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1904,67 +1979,79 @@ msgstr ""
 "Jei neišjungtas, Gajim automatiškai pakeis tekstines šypsenėles tokias kaip "
 "':)', į atitinkamus animuotus arba statinius paveiksliukus „rožiukus“"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Vienas žinučių langas:"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Val_dyti..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Prieigos keitimas"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Pranešk man apie asmenius, kurie: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Pranešk man apie asmenius, kurie: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Pranešk apie naujus _GMail laiškus"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Asmeninė Informacija"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Groti _garsus"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Parinktys"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Rodyti įvykį sistemos dėkle"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Pr_isijungti"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Atsijungti"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1972,148 +2059,152 @@ msgstr ""
 "Kai kurios žinutės gali turėti formatuotą turinį (pastorinimai, spalvos ir "
 "pan.). Jei pažymėsite, Gajim rodys tiesiog tekstą, be jokių formatavimų."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Rūšiuoti kontaktus pagal būklę"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Būklė"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Būklės p_iktogramų rinkinys, pagal nutylėjimą:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Stalled"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Naudoti _pernašos paveiksliukus"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Naudoti sisteminius nustatymus"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Naujam įvykiui ivykus"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatiškai keisti būklė į nuėjęs, po:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Rožiukai:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Failų menedžeris:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "Žymėti žodžius su _gramatine klaida"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruoti įvykius nuo asmenų nesančių kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignoruoti formatuotą turinį ateinančioms žinutėms"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "Į_einanti žinutė:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_El. pašto programa:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatiškai keisti būklę į nepasiekamas, po:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Išeinanti žinutė:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Not in roster"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutės"
 
@@ -2161,7 +2252,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Tvarka:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
@@ -2231,127 +2322,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Kitaip</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Garsai</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Skyrius:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "El. paštas:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Papildomas adresas:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Pavardė:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "Name"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Asmeninė svetainė:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Add a rule</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Savybės</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Slapyvardis:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Tel. Nr.:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Sąlygos</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Pašto kodas:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<i>Privatus Sąrašas</i>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Garsai</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Nustatymai</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Nustatymai</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Garsai</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Apie"
 
@@ -2361,17 +2452,17 @@ msgstr "Spauskia čia, kad įkeltum savo atvaizdą"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formatas: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Asmeninė Informacija"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Darbas"
 
@@ -2389,8 +2480,8 @@ msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Trinti"
 
@@ -2415,14 +2506,14 @@ msgstr "Redaguoti _Grupes"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Vykdyti Komandą..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
@@ -2433,7 +2524,7 @@ msgstr "_Trinti"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
@@ -2460,12 +2551,6 @@ msgstr "Pradėti _Pokalbį"
 msgid "_Allow him/her to see my status"
 msgstr "_Leisti jam/jai matyti mano būklę"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Drausti jam/jai matyti mano būklę"
@@ -2489,17 +2574,35 @@ msgstr "_Pervadinti"
 msgid "_Subscription"
 msgstr "_Sutikimas"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "nine"
 
+#: ../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 "Trinti"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2527,59 +2630,64 @@ msgid "Profile, A_vatar"
 msgstr "Profilis, At_vaizdas"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Rodyti _Atsijungusius Asmenis"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Rodyti _Pernašas"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Prieiga"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Turinys"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Redaguoti"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_DUK"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Nustatymai"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Išjungti"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Siųsti ži_nutę..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Rodinys"
 
@@ -2598,12 +2706,12 @@ msgid "_Add contact"
 msgstr "Įtraukti _Asmenį"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Asmens Informacija"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Ieškoti"
 
@@ -2691,10 +2799,6 @@ msgstr "Sutikimo užklausimas"
 msgid "_Deny"
 msgstr "_Drausti"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2721,10 +2825,6 @@ msgstr "Siųsti Vieną Ži_nutę"
 msgid "Show All Pending _Events"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Rodyk _Kontaktų Sąrašą"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "_Būklė"
@@ -2744,55 +2844,60 @@ msgstr "<b>Veiksmai</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Kitaip</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Nustatymai</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Šaltinis:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Nustatymai</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Aprašymas</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Kitaip</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Komentarai"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Keisti kambario nustatymus"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Asmuo"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Asmens Informacija"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Daugiau"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Atvaizdas:"
@@ -2805,6 +2910,11 @@ msgstr "<b>Jabber Srautas</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Įvestis</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Įjungti"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2833,13 +2943,13 @@ msgstr "Priskirti Open_PGP Raktą"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Redaguoti _Grupes"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Pervadinti"
 
@@ -2863,30 +2973,26 @@ msgstr "Šaltinis:"
 msgid "Status:"
 msgstr "Būklė:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Keisti Prieigą"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Asmens Informacija"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2911,7 +3017,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Colour"
 
@@ -2936,226 +3042,263 @@ msgstr "(None)"
 msgid "Hidden"
 msgstr "Hidden"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Jūs gavote naują įrašą:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "British"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norwegian (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norwegian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Your message can not be sent until you are connected."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "nine"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Nick"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "Šri_ftas:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Asmens Informacija"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encryption enabled"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Not in Roster"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Sąrašas aktyvių, baigtų ar sustabdytų failų siuntimų"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" by %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s from group chat %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encryption disabled"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Naudoti autentifikaciją"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Naudoti autentifikaciją"
@@ -3163,33 +3306,33 @@ msgstr "Naudoti autentifikaciją"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Commands: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage: /%s, clears the text window."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3198,66 +3341,66 @@ msgstr ""
 "Usage: /%s <action>, sends action to the current group chat. Use third "
 "person. (e.g. /%s explodes.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr ""
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Usage: /%s, hide the chat buttons."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "No help info for /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[This message is encrypted]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encryption disabled"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[This message is encrypted]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[This message is encrypted]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3265,183 +3408,195 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is now %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 is a file but it should be a directory"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 will now exit"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is a directory but should be a file"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Choose the groupchats you want to leave"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Groupchats"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "You left the following groupchats:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d unread message"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Use D-Bus and Notification-Daemon to show notifications"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Time in minutes, after which your status changes to away."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Away as a result of being idle"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Time in minutes, after which your status changes to not available."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Not available as a result of being idle"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Default"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Enable link-local/zeroconf messaging"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Language used by speller"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3451,7 +3606,7 @@ msgstr ""
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3461,17 +3616,17 @@ msgstr ""
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Treat * / _ pairs as possible formatting characters."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3481,7 +3636,7 @@ msgstr ""
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3489,7 +3644,7 @@ msgstr ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3497,7 +3652,7 @@ msgstr ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 
-#: ../src/common/config.py:161
+#: ../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 "
@@ -3507,19 +3662,19 @@ msgstr ""
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Characters that are printed before the nickname in conversations"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Characters that are printed after the nickname in conversations"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Add * and [n] in roster title?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3527,11 +3682,11 @@ msgstr ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "How many minutes should last lines from previous conversation last."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3539,11 +3694,11 @@ msgstr ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "How many lines to store for Ctrl+KeyUP."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3552,11 +3707,11 @@ msgstr ""
 "Either custom URL with %s in it where %s is the word/phrase or 'WIKTIONARY' "
 "which means use wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "If ticked, Gajim can be controlled remotely using gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3568,13 +3723,13 @@ msgstr ""
 "False and they sync with global status) based upon the status of the network "
 "connection."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3582,7 +3737,7 @@ msgstr ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3590,11 +3745,11 @@ msgstr ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ask before closing a group chat tab/window."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3602,7 +3757,7 @@ msgstr ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3610,7 +3765,13 @@ msgstr ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3619,33 +3780,27 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Notify of events in the system trayicon."
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Show tab when only one conversation?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Show tabbed notebook border in chat windows?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Show close button in tab?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3653,17 +3808,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr ""
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3671,13 +3826,13 @@ msgstr ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3685,7 +3840,7 @@ msgstr ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3693,11 +3848,11 @@ msgstr ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3705,7 +3860,7 @@ msgstr ""
 "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."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3713,7 +3868,7 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3727,29 +3882,29 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "If True, restored messages will use a smaller font than the default one."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3759,7 +3914,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3770,7 +3925,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3790,32 +3945,32 @@ msgstr ""
 "specific window. Note, changing this option requires restarting Gajim before "
 "the changes will take effect."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "If False, you will no longer see the avatar in the chat window."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "If True, pressing the escape key closes a tab/window."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in group chat window."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Hides the group chat occupants list in group chat window."
 
-#: ../src/common/config.py:250
+#: ../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."
@@ -3823,27 +3978,27 @@ msgstr ""
 "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."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Išsiųsti žinutę ir uždaryti langą"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "List of colours that will be used to colour nicknames in group chats."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab go to next composing tab when none is unread."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3851,7 +4006,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:256
+#: ../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 "
@@ -3861,7 +4016,7 @@ msgstr ""
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3869,7 +4024,16 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3877,7 +4041,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:259
+#: ../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"
@@ -3885,51 +4049,57 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../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 separately)"
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"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:278
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3937,60 +4107,68 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3998,119 +4176,125 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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' or ''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4118,148 +4302,178 @@ msgstr ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Wrong host"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registration information for transport %s has not arrived in time"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Register to %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extension not supported"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Invalid Jabber ID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from this group chat."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Such group chat does not exist."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Your registered nickname must be used."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Authorisation has been removed"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4269,247 +4483,252 @@ msgstr ""
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passphrase was not given"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "You will be connected to %s without OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Invalid username"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %s answered wrongly to register request: %s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %s answered wrongly to register request: %s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Connection Failed"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Saved in: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Connection Failed"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4518,26 +4737,31 @@ msgstr ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "It is not possible to send empty files"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4546,19 +4770,30 @@ msgstr ""
 "Subject: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Rename Contact"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observers"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transports"
 
@@ -4567,11 +4802,11 @@ msgid "Not in roster"
 msgstr "Not in roster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindings are missing in this computer"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus capabilities of Gajim cannot be used"
 
@@ -4601,1114 +4836,1124 @@ msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "twelve"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "one"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "two"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "three"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "four"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "five"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "six"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "seven"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "eight"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nine"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "ten"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "eleven"
 
+#. 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 "twelve"
+msgid "%(0)s o'clock"
+msgstr "%(0)s o'clock"
 
-#. 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 o'clock"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "five past $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "five past %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ten past $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "ten past %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "quarter past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "quarter past %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "twenty past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "twenty past %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "twenty five past $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "twenty five past %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "half past $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "half past %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "twenty five to $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "twenty five to %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "twenty to $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "twenty to %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "quarter to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "quarter to %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ten to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "ten to %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "five to $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "five to %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 o'clock"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s o'clock"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Night"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Early morning"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morning"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Almost noon"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Noon"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Afternoon"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Evening"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Late evening"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Start of week"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Middle of week"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "End of week"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server address required."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Užimtas"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Prisijungęs"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Prisijungęs"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Būklė klaidinga"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Kam"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Abu"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "is composing a message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Siųsti žinutę"
 msgstr[1] "Siųsti žinutę"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim account %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "of account %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "sustabdytas"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Paryškintas"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "Turiu "
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Chats"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Paryškintas"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Turinys"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completed"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Turinys"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Deactivated"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "uri"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Trinti"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "Contact Disconnected"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "Disabled"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "Disabled"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 #, fuzzy
 msgid "Excited"
 msgstr "Activated"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Group"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Hostas:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "message"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 #, fuzzy
 msgid "Intoxicated"
 msgstr "Activated"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Nematomas"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "one"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Hostas:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "German"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Keisti"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Atsijungęs"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Group"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "eleven"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Stalled"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Paskutinį kartą keista:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Nick"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Sleeping"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Gatvė:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Subscribed"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Time"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "nine"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Wrong host"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Evening"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Kuriama"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Morning"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "visus grupėje"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Working"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Evening"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Kicking %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Jungtis"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Working"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Working"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "room"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Eating"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Changing Subject"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Kicking %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Eating"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Working"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr ""
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Kicking %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Eating"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Atsijungti"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Eating"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Reason"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "Reason"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Sleeping"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Working"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Eating"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "I'm watching a movie."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Eating"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "I'm on the phone."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Transferring"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Kuriama"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 #, fuzzy
 msgid "On a Plane"
 msgstr "Online"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "Open as _Link"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Working"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Kuriama"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Working"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Unable to bind to port %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5717,19 +5962,13 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-"Connection to host could not be established: Timeout while sending data."
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5738,16 +5977,16 @@ msgstr ""
 "The host you configured as the ft_override_host_to_send advanced option is "
 "not valid, so ignored."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "To continue sending and receiving messages, you will need to reconnect."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi error"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5756,32 +5995,32 @@ msgstr ""
 "%s\n"
 "Link-local messaging might not work properly."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Please check if Avahi is installed."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Could not start local service"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Unable to bind to port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Could not change status of account \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5790,63 +6029,52 @@ msgstr ""
 "sent."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[This message is encrypted]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Contact is offline. Your message could not be sent."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Connection to host could not be established: Timeout while sending data."
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Disabled"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Active"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Event"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Būklės žinutė, pagal nutylėjimą"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Įjungti"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Kitaip</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5855,106 +6083,69 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "status message text"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "First Message Received"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Next Message Received"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Next Message Received"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Contact Connected"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Contact Disconnected"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Message Sent"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Group Chat Message Highlight"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Group Chat Message Received"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "GMail E-mail Received"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Name"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "If you want all the changes to apply instantly, you must relogin."
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable in this computer"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "All chat and groupchat windows will be closed. Do you want to continue?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "To change the account name, you must read all pending events."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5962,145 +6153,140 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Prieigų valdymas"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "A Jabber ID must be in the form \"user@servername\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "There was a problem retrieving your OpenPGP secret keys."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "You must create your account before editing your personal information."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "You are not connected to the server"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Without a connection, you can not edit your personal information."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Please rename or remove it before enabling link-local messaging."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6108,11 +6294,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6120,11 +6306,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6132,11 +6318,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6144,14 +6330,15 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6160,84 +6347,91 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Invalid username"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "You must provide a username to configure this account."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Nickname not allowed: %s"
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Duplicate Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "Invalid username"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "This account is already configured in Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Invalid entry"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6247,27 +6441,34 @@ msgstr ""
 "later by choosing the Accounts menuitem under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Your new account has been successfully created"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "You must provide a username to configure this account."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Please specify the new nickname you want to use:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact already in roster"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6277,7 +6478,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6285,30 +6486,72 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Your new account has been successfully created"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Active"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Event"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "First Message Received"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Next Message Received"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Next Message Received"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Contact Connected"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Contact Disconnected"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Message Sent"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Group Chat Message Highlight"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Group Chat Message Received"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "GMail E-mail Received"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6317,75 +6560,75 @@ msgstr ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Išjungti"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i days ago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Klientas"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6400,41 +6643,41 @@ msgstr "Contact name: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Group"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "In the group"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Contact name"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr ""
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Message"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Status Message"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
@@ -6442,105 +6685,105 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Save as Preset Status Message"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Please type a name for this status message"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Address:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Number:"
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Number:"
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Address:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! Address:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Please fill in the data of the contact you want to add in account %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Please fill in the data of the contact you want to add"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "I would like to add you to my roster."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Last but not least, we would like to thank all the package maintainers."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6551,93 +6794,93 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "The group chat Jabber ID has invalid characters."
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Subscription request for account %s from %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Invalid username"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "The group chat Jabber ID has invalid characters."
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s is not the name of a group chat."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "You can not join a group chat unless you are connected."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
@@ -6646,277 +6889,303 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "New Message"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "New Private Message"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "File Transfer Error"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "File Transfer Completed"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "I'm %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:2568
+#. 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 "Norėšiau jus įtraukti į savo kontaktų sąrašą."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Adresas"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Keisti"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Group"
+
+#. 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 "I would like to add you to my roster."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Order: %s, action: %s, type: %s, value: %s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %s, action: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "You must enter a name to create a privacy list."
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "You have not joined a groupchat."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact has invited you to group chat %(room_jid)s"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s wants to send you a file:"
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6924,38 +7193,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6965,58 +7234,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7024,317 +7293,340 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Invalid username"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %s using account %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykdyti komandą..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "Bookmark already set"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Group Chat \"%s\" is already in your bookmarks."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark has been added successfully"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "You can manage your bookmarks via Actions menu in your roster."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Joks"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Commands: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP Šifravimas"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Į_einanti žinutė:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "History Manager"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Message Sent"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Passwords do not match"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Prieigos keitimas"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "_Nustatyti būklei"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Įjungti Open_PGP kodavimą"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "Į_einanti žinutė:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Bendros parinktys"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Serverio teikiamos paslaugos"
@@ -7364,7 +7656,7 @@ msgstr "Size: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "You"
 
@@ -7374,7 +7666,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Recipient: "
 
@@ -7406,27 +7698,28 @@ msgid "Error message: %s"
 msgstr "Error message: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "File transfer stopped by the contact at the other end"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "File Transfer Stopped"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Description: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim cannot access this file"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "This file is being used by another process."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
@@ -7446,12 +7739,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
@@ -7459,22 +7752,22 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "What do you want to do?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -7510,52 +7803,52 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "It is not possible to send empty files"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim needs PyGTK 2.6 or above"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim needs GTK 2.6 or above"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim needs GTK 2.6 or above to run. Quiting..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime is missing libglade support"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7564,21 +7857,21 @@ msgstr ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim needs PySQLite2 to run"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7588,11 +7881,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7600,25 +7893,34 @@ msgstr ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for account %s."
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "You will be connected to %s without OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7628,147 +7930,186 @@ msgstr ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gajim.py:571
+#: ../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 "Do you accept this request?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Authorisation for %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s: %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %s ( %s )"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Sutikimo užklausimas"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "The contact \"%s\" has authorised you to see his or her status."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Unsubscribe"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s is now known as %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 is now %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "A password is required to join this group chat."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "Do _not ask me again"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnomekeyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "You have %d new mail conversation"
 msgstr[1] "You have %d new mail conversations"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7778,82 +8119,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Removes contact from roster"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Error reading file:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "You successfully received %(filename)s from %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "File transfer of %(filename)s from %(name)s stopped."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "You successfully sent %(filename)s to %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "File transfer of %(filename)s to %(name)s stopped."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "_Kiekvienai žinutei"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7861,31 +8212,31 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Prisijungimas"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
@@ -7893,98 +8244,76 @@ msgid ""
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "Do _not ask me again"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encryption disabled"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "You cannot join a group chat while you are invisible"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Bookmark already set"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Group Chat \"%s\" is already in your bookmarks."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark has been added successfully"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "You can manage your bookmarks via Actions menu in your roster."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Shows a help on specific command"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "command"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "show help on command"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Pops up a window with the next pending event"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7992,47 +8321,48 @@ msgstr ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "show only contacts of the given account"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Prints a list of registered accounts"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Changes the status of account or accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "one of: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "message"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status message"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8040,19 +8370,23 @@ msgstr ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Shows the chat dialogue so that you can send messages to a contact"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID of the contact that you want to chat with"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "if specified, contact is taken from the contact list of this account"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8062,29 +8396,29 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "message contents"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp key"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "if specified, the message will be encrypted using this public key"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "if specified, the message will be sent using this account"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8094,135 +8428,135 @@ msgstr ""
 "account are optional. If you want to set only 'account', without 'OpenPGP "
 "key', just set 'OpenPGP key' to ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "subject"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "message subject"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of the contact that will receive the message"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Gets detailed info on a contact"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID of the contact"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Gets detailed info on a account"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Name of the account"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sends file to a contact"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "file"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "File path"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "if specified, file will be sent using this account"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Lists all preferences and their values"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Sets value of 'key' to 'value'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' is the name of the preference, 'value' is the value to set it to"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Deletes a preference item"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "name of the preference to be deleted"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Writes the current state of Gajim preferences to the .config file"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Removes contact from roster"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Adds contact to roster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Adds new contact to this account"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Returns current status (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returns current status message (the global one unless account is specified)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Returns number of unread messages"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Opens 'Start Chat' dialogue"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Starts chat, using this account"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Sends custom XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML to send"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8230,72 +8564,77 @@ msgstr ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "message contents"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Kambarys:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname not found: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Passwords do not match"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Please check if avahi-daemon is running."
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the roster window"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8304,31 +8643,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8337,7 +8676,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8346,7 +8685,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8355,7 +8694,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8373,177 +8712,180 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "theme name"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "You cannot delete your current theme"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "You are no longer in group chat \"%s\" or \"%s\" has left."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Pokalbio istorija"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Prisijungimas"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Your new account has been successfully created"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s has been banned by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Affiliation:"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s has been kicked by %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Invalid username"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname not found: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "This group chat has no subject"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invited %(contact_jid)s to %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Nickname not found: %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 ""
 "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."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8552,7 +8894,7 @@ msgstr ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8561,7 +8903,7 @@ msgstr ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8570,7 +8912,7 @@ msgstr ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8579,18 +8921,17 @@ msgstr ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "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."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8599,83 +8940,97 @@ msgstr ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Usage: /%s <nickname>, changes your nickname in current group chat."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Usage: /%s , display the names of group chat occupants."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Usage: /%s [topic], displays or updates the current group chat topic."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Usage: /%s <nickname>, changes your nickname in current group chat."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Are you sure you want to leave group chat \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "If you close this window, you will be disconnected from this group chat."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Description: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8706,74 +9061,74 @@ msgstr "Details"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Error parsing file:"
 
 #. 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 "Could not write to %s. Session Management support will not work"
 
 #. 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 is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Would you like to make Gajim the default Jabber client?"
 
-#: ../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 "Always check to see if Gajim is the default Jabber client on startup"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../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 "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Message"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8781,7 +9136,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8795,175 +9150,185 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s on %(time)s said: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Do you really want to delete the logs of the selected contact?"
 msgstr[1] "Do you really want to delete the logs of the selected contacts?"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:585
+#: ../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] "Do you really want to delete the selected message?"
 msgstr[1] "Do you really want to delete the selected messages?"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Conversation History with %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is now %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is now: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Could not load image"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "You are not connected to the server"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Do you really want to delete the selected message?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Messages"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "New Private Message from group chat %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Bendros parinktys"
+msgid "Ignore"
+msgstr "nine"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "File path"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Such group chat does not exist."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Could not load image"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Information received"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Without a connection you can not publish your contact information."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Sending profile..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Information NOT published"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "vCard publication failed"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -8971,55 +9336,46 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "If \"%s\" accepts this request you will know his or her status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1920
-#, fuzzy
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnomekeyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9027,15 +9383,28 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Are you sure you want to leave group chat \"%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 "You have unread messages"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9044,16 +9413,16 @@ msgstr ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9061,11 +9430,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9075,52 +9444,57 @@ msgstr ""
 "these transports:%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Do you want to remove group %s from the roster?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove also all contacts in this group from your roster"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9129,12 +9503,12 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "What do you want to do?"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9142,16 +9516,16 @@ msgstr ""
 "By removing this contact you also by default remove authorisation resulting "
 "in him or her always seeing you as offline."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "I want this contact to know my status after removal"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9160,19 +9534,19 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "You must create an account before you can chat with other contacts."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9181,13 +9555,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 
-#: ../src/roster_window.py:3786
+#: ../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 "
@@ -9197,149 +9571,150 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Invalid File"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s wants to send you a file:"
 msgstr[1] "%s wants to send you a file:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Send %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Make %s and %s metacontacts"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "using account %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publish"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Active"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Keisti kambario nustatymus"
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Visiems"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Rename Contact"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Siųsti vieną žinutę"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transports"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Rodyti _Pernašas"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contact Disconnected"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "New Group Chat"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9356,20 +9731,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Subject: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9379,7 +9754,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9389,129 +9764,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../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 "Resource: "
 
-#: ../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 of this group chat"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../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 "Last status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Prisijungimas"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contact Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Kambarys:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Activated"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipas:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed 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,17 +9892,22 @@ msgstr "Unknown"
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "Unknown"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programos</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9545,7 +9915,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9553,13 +9923,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "You and the contact are interested in each other's presence information"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9567,20 +9937,77 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "You are waiting contact's answer about your subscription request"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " resource with priority "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP Šifravimas"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr "Jabber serverių paslaugų sąrašas (tokių, kaip: MSN, ICQ pernašos)"
+
+#~ msgid "Servers Features"
+#~ msgstr "Serverio teikiamos paslaugos"
+
+#~ msgid "Your JID:"
+#~ msgstr "Jūsų JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Pavadinimas:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Hostas:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Rodyk _Kontaktų Sąrašą"
+
+#~ msgid "Modify Account"
+#~ msgstr "Keisti Prieigą"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" by %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim account %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Kitaip</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Duplicate Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "This account is already configured in Gajim."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "File transfer stopped by the contact at the other end"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Bendros parinktys"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Active"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s has not broadcast an OpenPGP key, nor has one been assigned"
@@ -9698,18 +10125,9 @@ msgstr " resource with priority "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Išplėstinis Pranešimų Valdymas..."
 
-#~ msgid "_Font:"
-#~ msgstr "Šri_ftas:"
-
 #~ msgid "_Player:"
 #~ msgstr "_Grotuvas:"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
-#~ msgid "Address"
-#~ msgstr "Adresas"
-
 #~ msgid "City:"
 #~ msgstr "Miestas:"
 
@@ -9820,9 +10238,6 @@ msgstr " resource with priority "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Pakartokite slaptažodį:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Naudoti proksi"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9960,9 +10375,6 @@ msgstr " resource with priority "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Drop %s in group %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Make %s and %s metacontacts"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Hides the buttons in two persons chat window."
 
@@ -9981,9 +10393,6 @@ msgstr " resource with priority "
 #~ msgstr[0] " %d unread private message"
 #~ msgstr[1] " %d unread private messages"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid "Private Chat"
 #~ msgstr "Private Chat"
 
diff --git a/po/nb.po b/po/nb.po
index 5d38419f8..6a86433c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-05 18:31+0100\n"
-"PO-Revision-Date: 2008-12-05 15:51+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:56+0200\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
-"Language-Team: \n"
+"Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +38,7 @@ msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
@@ -59,7 +59,7 @@ msgid "_Personal Events"
 msgstr "_Personlige Hendelser"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
@@ -91,6 +91,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Vennligst velg 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"
@@ -98,60 +102,54 @@ msgstr ""
 "Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Bruk autentisering"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg ønsker å _bruke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Server Funksjonalitet"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
@@ -164,30 +162,31 @@ msgstr ""
 "til Jabber nettverket."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Din JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Maskinnavn:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Passord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -195,11 +194,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Brukernavn:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -208,18 +202,16 @@ msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Konto"
 
@@ -228,23 +220,22 @@ msgid "Account Modification"
 msgstr "Konto Endring"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administrators oppgaver"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Koble til automatisk når kontakten mistes"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
@@ -261,37 +252,35 @@ msgstr ""
 "deaktivert."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Tilkobling"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
 #. 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:1034
-#: ../src/common/helpers.py:1046 ../src/notify.py:516 ../src/notify.py:547
-#: ../src/notify.py:559
+#: ../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"
 
@@ -299,17 +288,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2654
-#: ../src/roster_window.py:5137
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Generelle"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
@@ -332,7 +318,6 @@ msgstr ""
 "tidsavbrudd som resulterer i frakobling"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -342,7 +327,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -352,7 +336,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -367,43 +350,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2051
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1141
-#: ../src/config.py:1212 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050
-#: ../src/config.py:3141 ../src/config.py:3209 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2723
-#: ../src/roster_window.py:2729 ../src/roster_window.py:2734
+#: ../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:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -414,7 +399,7 @@ msgstr ""
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
@@ -423,12 +408,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Ressur_s:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -443,30 +428,25 @@ msgstr ""
 "hendelsene. (se under)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "_Synkroniser kontakter"
@@ -476,21 +456,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings proxier"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Justér etter 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:13
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -498,11 +473,21 @@ msgstr "_Navn:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Justér etter status"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Bruk autentisering"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -510,21 +495,18 @@ msgstr ""
 "Velg denne slik at Gajim vil spør deg før sending av passordet over en "
 "usikker tilkobling"
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_oble til når Gajim starter"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Slå på"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Fornavn:"
 
@@ -533,7 +515,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -544,56 +525,98 @@ msgstr ""
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Etternavn:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5088
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Send hold-i-live meldinger"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Synk_roniser konto status med global status"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Bruk GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Bruk egendefinert maskinnavn/port"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Bruk egendefinert port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Rediger Personlig Informasjon..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Slå på"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Maskinnavn:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Behandle..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Advar før benyttelse av en usikker tilkobling"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "bruk HTTP_PROXY system variabel"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-tilføy"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-lukk"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-fjern"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "bruk HTTP_PROXY system variabel"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Konto"
@@ -778,7 +801,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:290
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Borte"
 
@@ -795,7 +818,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -804,7 +827,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -925,7 +948,7 @@ msgstr "Sist endret:"
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../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 "Du har mottatt en ny inntreden:"
 
@@ -969,11 +992,19 @@ msgstr "Skriv inn nytt passord:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Skriv inn din nye status melding:</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 "Forvalgte meldinger:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Lagre som Forvalg..."
 
@@ -1033,11 +1064,11 @@ msgstr "_Legg til Kontaktliste"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historie"
 
@@ -1181,7 +1212,7 @@ msgstr ""
 "Kontakt rad\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:748
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Fet"
 
@@ -1201,11 +1232,11 @@ msgstr "Gajim Tema Valg"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../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:749
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1253,7 +1284,7 @@ msgstr "Endre _Tittel..."
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../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 "_Bokmerke"
 
@@ -1285,23 +1316,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../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 "_Blokker"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kast 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 "_Eier"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../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 "_Frigi"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stemme"
 
@@ -1309,13 +1354,13 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:315
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tittel"
 
@@ -1333,7 +1378,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</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 "Slett"
 
@@ -1363,7 +1409,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:314
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
@@ -1386,7 +1432,7 @@ msgstr "Søk:"
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../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 "Bli med i Gruppesamtale"
 
@@ -1413,8 +1459,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1442,7 +1488,7 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Print status:"
 msgstr "Skriv 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:"
 
@@ -1471,36 +1517,56 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP Connect\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Navn:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Skriv:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Bruk autentisering"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Maskin:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Bruk proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Bruk autentisering"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Skriv:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Brukernavn:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1550,7 +1616,7 @@ msgstr "Vis 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 "_Send"
 
@@ -1647,10 +1713,14 @@ msgstr ""
 "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1664,19 +1734,19 @@ msgstr ""
 "Alltid bruk Xfce standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1690,31 +1760,31 @@ msgstr ""
 "Frakoblet kontaktliste med samtaler gruppert etter konto\n"
 "Frakoblet kontaktliste med samtaler gruppert etter type"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1724,7 +1794,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1734,7 +1804,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1742,11 +1812,11 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1754,20 +1824,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Dersom valgt vil Gajim endre status til Borte når maskinen ikke brukes."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1775,7 +1845,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1783,7 +1853,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1791,25 +1861,25 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise aktivitet for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
 "vinduet"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1819,7 +1889,7 @@ msgstr ""
 "Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
 "språkvalg brukes for denne kontakten eller gruppesamtale."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1829,7 +1899,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1839,14 +1909,14 @@ msgstr ""
 "husk at når man bruker E2E kryptering må den andre parten være enig i at "
 "logging er OK, ellers vil ikke beskjeder logges."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1855,7 +1925,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1863,7 +1933,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1871,43 +1941,50 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1917,19 +1994,24 @@ msgstr ""
 "Varsle meg om det\n"
 "Vis bare i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Vis hendelse i systemstatusfeltet"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1937,139 +2019,145 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
 "status melding"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
 "gjeldende status melding"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Innkommende melding:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Utgående melding:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutter"
 
@@ -2117,7 +2205,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2182,108 +2270,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Avdeling:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-Post:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Ekstra Adresse:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Etternavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullt Navn</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Fornavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Hjemmeside:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellomnavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Navn:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Kallenavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Telefonnummer:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stilling:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Post Kode:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Stat:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gate:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffiks:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Om"
 
@@ -2293,17 +2381,17 @@ msgstr "Klikk for å sette ditt kontaktbilde"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Personlig Info"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Jobb"
 
@@ -2321,8 +2409,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5125
-#: ../src/roster_window.py:5603 ../src/roster_window.py:5732
+#: ../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 "_Fjern"
 
@@ -2344,14 +2432,14 @@ msgstr "Rediger _Grupper..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5675
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5556
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -2361,7 +2449,7 @@ msgstr "_Fjern"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5053 ../src/roster_window.py:5641
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -2386,12 +2474,6 @@ msgstr "Start _Samtale"
 msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5116 ../src/roster_window.py:5593
-#: ../src/roster_window.py:5722
-msgid "_Block"
-msgstr "_Blokker"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Forby han/henne å se min status"
@@ -2413,16 +2495,34 @@ msgstr "_Gi nytt navn..."
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5587
-#: ../src/roster_window.py:5719
-msgid "_Unblock"
-msgstr "_Frigi"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Ikke ignorer"
 
+#: ../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 "gtk-lukk"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-lukk"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Legg til _Kontakt..."
@@ -2448,56 +2548,62 @@ msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Vis _Frakoblede Kontakter"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
-msgstr "Vis _kontaktliste"
-
 #: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Vis _Kontaktliste"
+
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Kontoer"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "_Send Enkelt Melding..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Vis"
 
@@ -2514,11 +2620,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5744
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2606,10 +2712,6 @@ msgstr "Abonnerings Forespørsel"
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Velg hvilken konto du skal synkronisere med"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Velg hvilken konto du du ønsker å synkronisere med"
@@ -2634,10 +2736,6 @@ msgstr "Send _Melding"
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Vis _Kontaktliste"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2655,49 +2753,54 @@ msgstr "<b>Spør:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Stat:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abbonement:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurert avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Bruker avatar:"
 
@@ -2709,6 +2812,11 @@ msgstr "<b>Jabber Trafikk</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Slå på"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2737,13 +2845,13 @@ msgstr "Tilegn Open_PGP Nøkkel"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
@@ -2767,29 +2875,25 @@ msgstr "Ressurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Rediger Konto"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../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 er i ferd med å eksekvere en kommando. Ønsker du å avbryte den?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Tjenesten endret sesjons identifikasjon. "
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Tjenesten endret sesjons identifikasjon. "
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
@@ -2814,7 +2918,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:768
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Farge"
 
@@ -2839,175 +2943,199 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Gjemt"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Du har mottatt en ny inntreden:"
+
 #. 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 "Engelsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Brtisk"
 
-#: ../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 "Spansk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:358 ../src/chat_control.py:551
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:359 ../src/chat_control.py:552
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:750
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Udefinert"
 
-#: ../src/chat_control.py:751
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Syk"
 
-#: ../src/chat_control.py:774
+#: ../src/chat_control.py:796
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:783
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktinformasjon"
 
-#: ../src/chat_control.py:1214 ../src/chat_control.py:1616
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Virkelig send fil?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1243 ../src/chat_control.py:2110
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:72
-#: ../src/common/helpers.py:302 ../src/conversation_textview.py:860
-#: ../src/dialogs.py:903 ../src/gajim.py:982 ../src/gajim.py:1642
-#: ../src/normal_control.py:483 ../src/roster_window.py:911
-#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1870 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3115 ../src/roster_window.py:5237
-#: ../src/roster_window.py:5422
+#: ../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 "ikke i kontaktliste"
 
-#: ../src/chat_control.py:1375 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "En liste over aktive, komplette og stoppede fil overføringer"
+
+#: ../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 "Ukjent Artist"
 
-#: ../src/chat_control.py:1377 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/chat_control.py:1379 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/chat_control.py:1383 ../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"
@@ -3016,26 +3144,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
 "fra  <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1388
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s etter %(artist)s\n"
-"fra %(source)s"
-
-#: ../src/chat_control.py:1511
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1596 ../src/dialogs.py:3907
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1597
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3043,50 +3162,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1606
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1631
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1633
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
 #. 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:1663
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3095,26 +3214,26 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:1711
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Kommando ikke støttet for zeroconf konto."
 
-#: ../src/chat_control.py:1722 ../src/groupchat_control.py:1651
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/chat_control.py:1725 ../src/groupchat_control.py:1665
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/chat_control.py:1728 ../src/groupchat_control.py:1670
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/chat_control.py:1731 ../src/groupchat_control.py:1686
+#: ../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 "
@@ -3123,38 +3242,38 @@ msgstr ""
 "Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk tredje "
 "person. (f.eks.  /%(command)s eksploderer.)"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Bruk: /%s, sender en ping til kontakten"
 
-#: ../src/chat_control.py:1739
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Bruk: /%s, sender meldingen til kontakten"
 
-#: ../src/chat_control.py:1742 ../src/groupchat_control.py:1709
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/chat_control.py:1874
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:1881
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:1884
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:1886
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:1891
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3162,25 +3281,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1893
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:1921 ../src/chat_control.py:1934
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:1927
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Den følgende meldingen ble kryptert"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2298
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2299
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3188,15 +3307,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2447 ../src/common/connection_handlers.py:1846
-#: ../src/common/connection_handlers.py:1892
-#: ../src/common/connection_handlers.py:2080
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1217
-#: ../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 "Database feil"
 
-#: ../src/chat_control.py:2448
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3205,7 +3324,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2684
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3214,156 +3333,168 @@ msgstr "%(name)s er nå %(status)s"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../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 er en fil men skulle ha vært 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 vill nå lukkes"
 
-#: ../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 er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Endre status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Sett fraværstype og beskrivelse"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Frakoblet - ikke kontakt"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Gå ut av Gruppesamtale"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Du har ikke blitt med i en gruppesamtale."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:72 ../src/roster_window.py:785
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:5013
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Gruppesamtaler"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
 "tid. "
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:452
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3130
+#: ../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:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Slå på link-lokal/zeroconf meldinger"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Språk som brukes av ordlisten"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3373,7 +3504,7 @@ msgstr ""
 "'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
 "'never' - aldri vis klokkeslett."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3383,18 +3514,18 @@ msgstr ""
 "4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
 "den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3405,7 +3536,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
 "installere docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3413,7 +3544,7 @@ msgstr ""
 "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
 "gruppesamtaler."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3421,7 +3552,7 @@ msgstr ""
 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
 "opptatt av noen andre i samtalegruppen."
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3432,19 +3563,19 @@ msgstr ""
 "strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3452,12 +3583,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3465,11 +3596,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3478,11 +3609,11 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3494,12 +3625,12 @@ msgstr ""
 "at de synkroniserer med global status) basert på statusen til nettverks "
 "tilkoblingen."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3507,7 +3638,7 @@ msgstr ""
 "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
 "avslått."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3515,11 +3646,11 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3527,7 +3658,7 @@ msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3535,7 +3666,13 @@ msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3544,35 +3681,27 @@ msgstr ""
 "grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
 "videresending."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis notatblokk faner i samtalevinduer?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
-"meldinger skal logges?"
-
-#: ../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 "
@@ -3583,16 +3712,16 @@ msgstr ""
 "separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
 "nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvik nye meldinger i popup vindu?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
-#: ../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."
@@ -3600,14 +3729,14 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
 "oppstart."
 
-#: ../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."
@@ -3615,7 +3744,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3623,12 +3752,12 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../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 ""
 "Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
 
-#: ../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."
@@ -3636,7 +3765,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3644,7 +3773,7 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../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 "
@@ -3657,29 +3786,29 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget 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 ""
 "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../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 "
@@ -3689,7 +3818,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3700,7 +3829,7 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3721,31 +3850,31 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../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."
@@ -3753,15 +3882,15 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
 "samme person som snakker som i den forrige meldingen."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3769,11 +3898,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: ../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."
@@ -3781,7 +3910,7 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../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 "
@@ -3791,7 +3920,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din server."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3799,7 +3928,16 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
+"konto passord."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3807,7 +3945,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../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"
@@ -3815,7 +3953,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../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."
@@ -3823,7 +3961,7 @@ msgstr ""
 "Dersom Sant vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../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."
@@ -3831,18 +3969,18 @@ msgstr ""
 "Dersom Sant vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
 "konvertere før innsetting i et samtale vindu."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../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 ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3850,11 +3988,11 @@ msgstr ""
 "Dersom Sant vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../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."
@@ -3862,16 +4000,22 @@ msgstr ""
 "Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
 "er større."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
 "\"ekte\" uri."
 
-#: ../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."
@@ -3879,7 +4023,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../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"
@@ -3888,26 +4032,26 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../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 ""
 "Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
 "er konfigurert."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: ../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"
@@ -3915,34 +4059,43 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../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
+#, fuzzy
 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 ""
 "Hvor mange sekunder ventes svar på keepalive pakke før vi prøver å koble til "
 "på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../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."
@@ -3950,19 +4103,27 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:393
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
+"meldinger skal logges?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3970,101 +4131,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:395 ../src/common/config.py:398
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:406 ../src/common/config.py:408
-#: ../src/common/config.py:409 ../src/common/config.py:412
-#: ../src/common/config.py:413
+#: ../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:419 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:421 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:423 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:431 ../src/config.py:1391
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:434 ../src/common/config.py:435
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4073,68 +4234,99 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:459 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:72
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Feil maskinnavn"
 
-#: ../src/common/connection_handlers.py:235
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: ../src/common/connection_handlers.py:640
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1844
-#: ../src/common/connection_handlers.py:1890
-#: ../src/common/connection_handlers.py:2078
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1215
-#: ../src/gajim.py:399
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "vCard publisering vellykket"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "vCard publisering feilet"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:850
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1218
-#: ../src/gajim.py:178
+#: ../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 "Ugyldig Jabber ID"
+
+#: ../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: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."
@@ -4143,78 +4335,77 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
 "org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
 
-#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2040
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2046
-#: ../src/common/connection_handlers.py:2049
-#: ../src/common/connection_handlers.py:2053 ../src/gajim.py:562
+#: ../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 "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2044
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2047
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2050
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2096
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2103
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2130
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2151
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2153
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4225,15 +4416,15 @@ msgstr ""
 "fjerne den"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../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 vil bli tilkoblet til %s uten OpenPGP."
@@ -4366,73 +4557,78 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:267
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:313
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:326
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:523
-msgid "Connection to proxy failed"
-msgstr "Tilkobling til proxy feilet"
-
-#: ../src/common/connection.py:611 ../src/common/connection.py:712
-#: ../src/common/connection.py:1350
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:612 ../src/gajim.py:1059
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Lagret i: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Tilkobling til proxy feilet"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:645 ../src/common/connection.py:693
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: ../src/common/connection.py:667
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:670
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4441,7 +4637,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:672
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4450,24 +4646,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:713
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:738
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:740
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:802
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4476,13 +4672,18 @@ msgstr ""
 "Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
 "dine tilkoblede ressurser. Deaktiver den og prøv igjen."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 er ikke mulig å sende tomme filer"
+
+#: ../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 "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
 
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 ""
@@ -4490,12 +4691,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1105
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1205
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4504,20 +4705,30 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Inviter _Kontakter"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:72
-#: ../src/gajim.py:982
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:72 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1349 ../src/gajim.py:808 ../src/roster_window.py:815
-#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
+#: ../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"
 
@@ -4526,11 +4737,11 @@ msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
@@ -4561,1043 +4772,1053 @@ msgstr ""
 "Sesjons bussen er ikke tilgjengelig.\n"
 "Prøv å les http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "tolv"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "en"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "to"
 
-#: ../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 "fire"
 
-#: ../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 "seks"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "syv"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "åtte"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "ni"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "ti"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "elleve"
 
+#. 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"
+msgid "%(0)s o'clock"
+msgstr "klokken %(0)s"
 
-#. 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 "klokken $0"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem over $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "fem over %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ti over $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "ti over %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart over $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "kvart over %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "ti på halv $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "ti på halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fem på halv $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "fem på 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 over halv $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "fem over halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "ti over halv $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "ti over halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvart på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "kvart på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ti på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "ti på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fem på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "fem på %(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 "Tidlig morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Nesten formiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Middag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Ettermiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Ettermiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Sen kveld"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Starten av uken"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Midten av uken"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Slutten av uken"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:215
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:218
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:222
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:225
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:229
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:232
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:235
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:283 ../src/features_window.py:119
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:311
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:313
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:409
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: ../src/common/helpers.py:983 ../src/common/helpers.py:990
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:996
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:999 ../src/common/helpers.py:1018
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1001
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1015
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1048
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s er ikke et gyldig 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 "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim konto %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "for konto %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Redd"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Forbløffet"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Amorøs"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Sint"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Irritert"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Engstelig"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Opphisset"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: ../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 "Rolig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Forsiktig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Kald"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Selvsikker"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Overveiende"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Utfordrende"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Gretten"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Gal"
 
-#: ../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 "Nysgjerrig"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Nedslått"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Deprimert"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Vemmes"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Forferdet"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Distrahert"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Misunnelig"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Begeistret"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Flørtende"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustrert"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Sørgende"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Gretten"
 
-#: ../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 "Håpefull"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Ydmyk"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Ydmyket"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Imponert"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "I Respekt"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Indignert"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Interessert"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Sjalu"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Bortkommet"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Heldig"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Slem"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Humørsyk"
 
-#: ../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 "Nøytral"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Opprørt"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Leken"
 
-#: ../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 "Avslappet"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../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 "Lei seg"
 
-#: ../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 "Tilfreds"
 
-#: ../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 "Sjokkert"
 
-#: ../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 "Syk"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../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 "Stresset"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Sterk"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Tørst"
 
-#: ../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 "Udefinert"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Svak"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Bekymret"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Gjør Oppgaver"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Kjøper Grønnsaker"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Vasker"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Koker"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Gjør Vedlikehold"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Tar Oppvasken"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Vasker Skittentøy"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Gjør Hagearbeid"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Løper et Ærend"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Går tur med Hunden"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Tar seg en Øl"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Tar seg en Kaffe"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Tar seg en Kopp Te"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Tar seg en Matbit"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Spiser Lunch"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Trener"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Sykler"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Danser"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "På tursti"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Spiller Sport"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Løper"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Går på Ski"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Trener"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Steller seg"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "Er på Spa"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Pusser Tenner"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Får seg en Hårklipp"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Barberer seg"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Tar et Bad"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Tar seg en Dusj"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Har en Avtale"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Slapper av"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Gjemmer seg"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "På Ferie"
 
-#: ../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 "Planlagt Ferie"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Tenker"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Slapper Av"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Fisker"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../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 "Fester"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Leser"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Sover"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Røyker"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: ../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 på en Film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Snakker"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "I det Virkelige Liv"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Sitter i Telefonen"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "På Video Telefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Reiser"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Kjører"
 
-#: ../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å et Fly"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "På et Tog"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "På en Reise"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Spaserer"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "I et Møte"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Skriver"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å lytte til port %s."
 
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5606,7 +5827,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5623,15 +5844,15 @@ msgstr ""
 "Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
 "ikke gyldig, så den ignoreres."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5640,31 +5861,31 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5673,66 +5894,50 @@ msgstr ""
 "sendes."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
 "data."
 
-#: ../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 "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:150 ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Hendelse"
-
-#: ../src/config.py:402
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:409
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:451
-msgid "Always use OS/X default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../src/config.py:452
-msgid "Custom"
-msgstr "Egendefinert"
-
-#: ../src/config.py:645 ../src/dialogs.py:1199
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:646
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5741,106 +5946,70 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Første Melding Motatt"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Neste Melding Motatt i Fokus"
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Neste Melding Motatt ikke i Fokus"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Kontakt Koblet til"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Kontakt Frakoblet"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Melding Sendt"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Gruppe Samtale Melding Utheving"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Gruppe Samtale Melding Motatt"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "Gmail E-post Motatt"
-
 #. Name column
-#: ../src/config.py:1313 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
-#: ../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 "Navn"
 
-#: ../src/config.py:1399
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1525 ../src/config.py:1624
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1660 ../src/config.py:1703
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1687
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:1699
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1700
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1704
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5848,144 +6017,139 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1715 ../src/config.py:1719
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1720
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1794
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1795
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864
-#: ../src/config.py:3079 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Ugyldig Jabber ID"
-
-#: ../src/config.py:1822
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2012 ../src/config.py:3151
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2013 ../src/config.py:3152
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2034
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2035
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:2070
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2071
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2078
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2079
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
 
-#: ../src/config.py:2086 ../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 er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:2091
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2092
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2123
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2124
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2307
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2309
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2345
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2347
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2348
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2397 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2439
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2441
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5993,11 +6157,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2443
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2444
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6005,11 +6169,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2446
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2447
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6017,11 +6181,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2450
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6029,14 +6193,15 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2451
+#: ../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 ""
 "Can være en av følgende:\n"
 "1. bruker@domene/ressurs (bare denne ressursen treffer).\n"
@@ -6045,83 +6210,88 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2548
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2570 ../src/gajim.py:1431 ../src/roster_window.py:1932
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2571 ../src/roster_window.py:1906
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2572 ../src/roster_window.py:1933
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2581
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2678
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2678
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2679
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2680
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2781
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2782
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:3062
-msgid "Invalid username"
-msgstr "Ugyldig brukernavn"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3064
-msgid "You must provide a username to configure this account."
-msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Kallenavn ikke lovlig: %s"
 
-#: ../src/config.py:3090
-msgid "Duplicate Jabber ID"
-msgstr "Duplikat Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Ugyldig server"
 
-#: ../src/config.py:3091
-msgid "This account is already configured in Gajim."
-msgstr "Kontakten er allerede konfigurert i Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:3108
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3109 ../src/config.py:3298
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6131,25 +6301,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3127
-msgid "Invalid server"
-msgstr "Ugyldig server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3128
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3179 ../src/gajim.py:2009
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3180 ../src/gajim.py:2010
+#: ../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 ""
 "Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
 
-#: ../src/config.py:3248
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6164,7 +6342,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3254 ../src/gajim.py:2033
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6175,23 +6353,63 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3277 ../src/config.py:3316
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3297
-msgid "Your new account has been created successfully"
-msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
-
-#: ../src/config.py:3400
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Hendelse"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Første Melding Motatt"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Neste Melding Motatt i Fokus"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Neste Melding Motatt ikke i Fokus"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontakt Koblet til"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontakt Frakoblet"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Melding Sendt"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Gruppe Samtale Melding Utheving"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Gruppe Samtale Melding Motatt"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Gmail E-post Motatt"
+
+#: ../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"
@@ -6201,7 +6419,7 @@ msgstr ""
 "har blitt motatt av andre enden. Dersom dette ikonet\n"
 "vises lenge er det sannsynlig at meldingen ble mistet."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6209,74 +6427,74 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:691
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Avslutt"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:703
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:708
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:738
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:741
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:1014 ../src/conversation_textview.py:1032
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1289
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1293
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6291,145 +6509,145 @@ msgstr "Kontakt navn: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
 "meldingen?"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6442,88 +6660,88 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Kallenavnet inneholder ulovlige tegn"
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2634
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1451
-#: ../src/groupchat_control.py:1732
-msgid "The nickname has not allowed characters."
-msgstr "Kallenavnet inneholder ulovlige tegn"
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1899
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1900
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../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 "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../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:"
@@ -6532,276 +6750,301 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../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 "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:474
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:476
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:478
-#: ../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 "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:478
-#: ../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 "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:479
-#: ../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 "Ny Privat Melding"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1596 ../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:1662 ../src/notify.py:481
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1562 ../src/gajim.py:1629
-#: ../src/notify.py:483 ../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 "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1704 ../src/gajim.py:1726
-#: ../src/gajim.py:1743 ../src/notify.py:485 ../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 Overføring Komplett"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1707 ../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 Overføring Stoppet"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1452 ../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 "Gruppesamtale invitasjon"
 
-#: ../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 "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:2559
+#. 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 "Jeg vil legge deg til min kontaktliste."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Adresse"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Humørsyk"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Gruppe"
+
+#. 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 "Jeg vil legge deg til min kontaktliste."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)"
 "s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3351
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6812,19 +7055,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:3833 ../src/dialogs.py:3920
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:3841
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:3846
+#: ../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 "
@@ -6834,19 +7077,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:3849 ../src/dialogs.py:3901 ../src/dialogs.py:3914
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6861,23 +7104,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:3902
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:3915
+#: ../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."
@@ -6886,7 +7129,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -6894,33 +7137,33 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6928,219 +7171,241 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1190 ../src/disco.py:1354
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Bokmerke allerede satt"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bokmerke har blitt lagt til"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "SSL sertifikats feil"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek som brukes til å verifisere server sertifikater for å sikre en "
 "sikker tilkobling."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Krever python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk oppdagede klienter på et lokalt nettverk."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Krever pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Kommandoer: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Et script for å kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Krever python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88
+#: ../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 "Funksjon ikke tilgjengelig i Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenPGP"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP Kryptering"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Kryptering av samtalemeldinger med GPG nøkler."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Krever gpg og python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Autodeteksjon av nettverksstatus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Krever gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Sesjons Behandling"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesjon er lagret på utlogging og gjenopprettes ved pålogging."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Passord for å komme inn i rommet"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 
-#: ../src/features_window.py:75
-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 "Krever gnome-keyring og python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evne til å koble til servere som bruker SRV records."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Krever dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Krever nslookup for å bruke SRV records."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontroll av komponerte meldinger."
 
-#: ../src/features_window.py:83
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Krever python-gnome2-extras eller kompilering av gtkspell modul fra Gajims "
-"kildekode."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Krever python-sexy."
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Kunngjøringer"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Passiv påminnelse for nye hendelser."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7148,51 +7413,52 @@ msgstr ""
 "Krever python-notify eller alternativt python-dbus i samarbeid med "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Trayicon"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Krever python-gnome2-extras eller kompilert trayicon modul fra Gajims "
 "kildekode."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Krever PyGTK >= 2.10."
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Ubrukt"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Justér etter status"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til å måle inaktiv tid for å kunne sette auto status."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformer LaTeX uttrykk mellom $$ $$."
 
-#: ../src/features_window.py:99
+#: ../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."
@@ -7200,7 +7466,7 @@ msgstr ""
 "Krever texlive-latex-base og dvipng. Du må sette 'use_latex' til True i "
 "Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:100
+#: ../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."
@@ -7208,23 +7474,25 @@ msgstr ""
 "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
 "'use_latex' til True i Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Ende til Ende Kryptering"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Kryptering av samtalemeldinger."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Krever python-crypto."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7232,24 +7500,24 @@ msgstr ""
 "Generer XHTML ut fra RST kode (see http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu faner."
 
-#: ../src/features_window.py:111 ../src/features_window.py:112
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Krever python-sexy."
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Funksjonalitet"
 
@@ -7278,7 +7546,7 @@ msgstr "Størrelse: %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:496
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Du"
 
@@ -7288,7 +7556,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -7320,26 +7588,27 @@ msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Fil Overføring Stoppet"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
@@ -7359,12 +7628,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../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 ikke overskrive eksisterende fil \"%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."
@@ -7372,22 +7641,22 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive 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 "Denne filen finnes fra før"
 
-#: ../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 "Hva ønsker du å gjøre?"
 
 #. 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\" er ikke 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 ikke rettigheter til å lage filer i denne katalogen."
 
@@ -7423,11 +7692,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -7435,36 +7704,40 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:92
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s er ikke et gyldig loggnivå"
-
-#: ../src/gajim.py:164
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../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 trenger PyGTK 2.8 eller høyere"
 
-#: ../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 tenger PyGTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../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 trenger GTK 2.8 eller høyere"
 
-#: ../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 trenger GTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:202
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7473,20 +7746,20 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
 
-#: ../src/gajim.py:211
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:219
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../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 "
@@ -7496,11 +7769,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:373
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:374
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7508,25 +7781,35 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:499
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Ingen GPG nøkkel tildelt"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:515
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gajim.py:516
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7537,50 +7820,59 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gajim.py:577
+#: ../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 "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:579
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gajim.py:582
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:630 ../src/notify.py:493 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:936 ../src/gajim.py:940
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:950 ../src/gajim.py:964
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Abonnerings Forespørsel"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:1016
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:1017
+#: ../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?"
@@ -7588,72 +7880,77 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: ../src/gajim.py:1058
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Fjern Abonnement"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:1234 ../src/groupchat_control.py:1162
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: ../src/gajim.py:1252 ../src/groupchat_control.py:1337
-#: ../src/history_window.py:426 ../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 er nå %(status)s"
 
-#: ../src/gajim.py:1315
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(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:1379 ../src/groupchat_control.py:1122
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gajim.py:1384
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gajim.py:1394
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gajim.py:1400
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
 
-#: ../src/gajim.py:1466
+#: ../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"
@@ -7661,27 +7958,56 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: ../src/gajim.py:1468
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1471
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG fungerer ikke"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
+"meldinger."
+
+#: ../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 "_Ikke spør meg igjen"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
+"variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
+
+#: ../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:1575
+#: ../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-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1588
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7696,34 +8022,44 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1659
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1727
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Feil under lesing av fil:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1731
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1744
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1748
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1836
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7732,36 +8068,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gajim.py:1843
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1940
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gajim.py:1976
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gajim.py:1977
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7769,11 +8105,11 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: ../src/gajim.py:2030
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7784,19 +8120,19 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gajim.py:2036
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gajim.py:2051
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gajim.py:2052
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7809,11 +8145,11 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket?"
 
-#: ../src/gajim.py:2074 ../src/gajim.py:2104
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gajim.py:2075
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7821,16 +8157,11 @@ msgstr ""
 "Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
 "at du ønsker å gjøre det?"
 
-#: ../src/gajim.py:2077 ../src/gajim.py:2107
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gajim.py:2078 ../src/gajim.py:2108 ../src/groupchat_control.py:1841
-#: ../src/roster_window.py:3769
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
-
-#: ../src/gajim.py:2105
+#: ../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?"
@@ -7839,21 +8170,21 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gajim.py:2122
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2591 ../src/gajim.py:2613
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gajim.py:2592
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7861,7 +8192,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gajim.py:2614
+#: ../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 "
@@ -7871,55 +8202,38 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2640 ../src/roster_window.py:3303
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2919
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gajim.py:3016
-msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
-
-#: ../src/gajim.py:3017
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
-
-#: ../src/gajim.py:3030
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
-
-#: ../src/gajim.py:3031
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7927,49 +8241,50 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "melding"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -7977,19 +8292,23 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../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 spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7999,30 +8318,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8032,137 +8351,137 @@ msgstr ""
 "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8170,67 +8489,72 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "meldings innhold"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8239,15 +8563,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:403
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8256,16 +8580,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:407
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8274,7 +8598,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:480
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8283,7 +8607,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:485
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8292,7 +8616,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:504
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8309,175 +8633,178 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Vennligst lag et nytt rent tema med ditt ønskede navn."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:149
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:151
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:602
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:604
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
-#: ../src/groupchat_control.py:1025
-msgid "Really send file?"
-msgstr "Virkelig send fil?"
-
-#: ../src/groupchat_control.py:1026
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1125
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1136
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1151
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1198 ../src/groupchat_control.py:1202
-#: ../src/groupchat_control.py:1207
+#: ../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 blitt fjernet fra rommet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1731
-msgid "Invalid nickname"
-msgstr "Ugyldig kallenavn"
-
-#: ../src/groupchat_control.py:1474 ../src/groupchat_control.py:1492
-#: ../src/groupchat_control.py:1576 ../src/groupchat_control.py:1593
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
-#: ../src/groupchat_control.py:1654
+#: ../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 "Kallenavn ikke funnet: %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 ""
 "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
 "samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det "
 "inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil "
 "denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8486,7 +8813,7 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8495,7 +8822,7 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8504,7 +8831,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
 "en grunn dersom spesifisert."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8513,18 +8840,17 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1681
-#, 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 ""
 "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
 "kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1690
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8533,25 +8859,25 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
 "sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
 "samtalerom."
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8559,40 +8885,56 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1835
+#: ../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 ""
+"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+"samtalerom."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: ../src/groupchat_control.py:1874
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1875
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1880
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1906
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1907
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8600,22 +8942,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2080
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2081 ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2372
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8646,80 +8988,80 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Feil under traversering 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 "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
 #. 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 er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../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 "Alltid sjekk om Gajim er standard Jabber klient ved oppstart"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../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 "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8733,76 +9075,86 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:509
+#: ../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:546
+#: ../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] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
 
-#: ../src/history_manager.py:550 ../src/history_manager.py:585
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:582
+#: ../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] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:296
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:341
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:422
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:432
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:435
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:442
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Du er ikke tilkoblet til serveren"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Ønsker du virkelig å slette den valgte meldingen?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -8814,66 +9166,67 @@ msgstr "- meldinger vil bli logget"
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %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 "Melding fra %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Generisk"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignorer"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2768
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2771
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2773 ../src/roster_window.py:2784
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
@@ -8905,56 +9258,48 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:286 ../src/roster_window.py:940
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1909
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
-"variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
-
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2103 ../src/roster_window.py:3247
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2104 ../src/roster_window.py:3248
+#: ../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?"
@@ -8962,15 +9307,28 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:2130
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505
+#: ../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 "Er du sikker på at du vil gå ut av rommene \"%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 uleste meldinger"
 
-#: ../src/roster_window.py:2269
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8978,16 +9336,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8995,11 +9353,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9009,51 +9367,56 @@ msgstr ""
 "transportene: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2649
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2650
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: ../src/roster_window.py:2716
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:2755
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3108
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9062,11 +9425,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3117
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3121
+#: ../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."
@@ -9074,16 +9437,16 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9093,19 +9456,19 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: ../src/roster_window.py:3687
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3689
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9113,13 +9476,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:3763
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:3765
+#: ../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 "
@@ -9129,139 +9492,141 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:3878
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:3889
+#: ../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] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Send %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Gjør %s og %s metakontakter"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4566 ../src/roster_window.py:4637
-#: ../src/roster_window.py:4646 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4653
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4695 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4755
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:4817 ../src/roster_window.py:4926
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:4844
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:4851
-msgid "Mood"
-msgstr "Stemning"
-
-#: ../src/roster_window.py:4855
-msgid "Activity"
-msgstr "Aktivitet"
-
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5014
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
 #. Send Group Message
-#: ../src/roster_window.py:5022 ../src/roster_window.py:5548
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5030
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Send single message
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5693
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
 #. History manager
-#: ../src/roster_window.py:5967
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5976
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -9278,20 +9643,20 @@ msgstr "Feil i motatt dataskjema"
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Disk SkriveFeil"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9306,7 +9671,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9321,124 +9686,116 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../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 "Ressurs: "
 
-#: ../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 denne samtalegruppen"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../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 "Siste status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../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 "Sang:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../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"
@@ -9454,16 +9811,21 @@ msgstr "?Client:Ukjent"
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Client:Ukjent"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9471,7 +9833,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9479,13 +9841,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9493,24 +9855,108 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+
+#~ msgid "Servers Features"
+#~ msgstr "Server Funksjonalitet"
+
+#~ msgid "Your JID:"
+#~ msgstr "Din JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Maskin:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Vis _kontaktliste"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Velg hvilken konto du skal synkronisere med"
+
+#~ msgid "Modify Account"
+#~ msgstr "Rediger Konto"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s etter %(artist)s\n"
+#~ "fra %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim konto %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#~ msgid "Custom"
+#~ msgstr "Egendefinert"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Duplikat Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Kontakten er allerede konfigurert i Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Krever python-gnome2-extras eller kompilering av gtkspell modul fra "
+#~ "Gajims kildekode."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Ubrukt"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
+
+#~ msgid "Generic"
+#~ msgstr "Generisk"
+
+#~ msgid "Mood"
+#~ msgstr "Stemning"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivitet"
+
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Krever kompilering av ide modulen fra Gajims kildekode."
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP Kryptering"
-
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
 
@@ -9535,9 +9981,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Retype Password:"
 #~ msgstr "_Repeter Passord:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Bruk proxy"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9734,9 +10177,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Pop it up"
 #~ msgstr "_Sprett opp"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "Address"
 #~ msgstr "Adresse"
 
@@ -9869,9 +10309,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Slipp %s i samtalerom %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Gjør %s og %s metakontakter"
-
 #~ msgid "Affiliation:"
 #~ msgstr "Tilhørighet: "
 
@@ -9950,9 +10387,6 @@ msgstr " ressurs med prioritet"
 #~ "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 #~ "aktiv når notify_on_all_muc_messages er True)"
 
-#~ msgid "Add"
-#~ msgstr "Adresse"
-
 #~ msgid "Away "
 #~ msgstr "Borte"
 
@@ -9974,9 +10408,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ugyldig rom eller servernavn"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "vCard publisering vellykket"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Din personlige informasjon har blitt publisert uten feil."
 
@@ -10036,9 +10467,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s har sendt deg en ny melding."
 
-#~ msgid "GUI Migration failed"
-#~ msgstr "vCard publisering feilet"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Loggene ble migrert til databasen uten feil."
 
@@ -10096,9 +10524,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "account: "
 #~ msgstr "konto:"
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
diff --git a/po/nl.po b/po/nl.po
index 8a82a4dda..0d088e017 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -43,7 +43,7 @@ msgid "_Add Contact..."
 msgstr "_Contact Toevoegen..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
@@ -67,7 +67,7 @@ msgid "_Personal Events"
 msgstr "Persoonlijke Informatie"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Start Gesprek"
@@ -102,60 +102,59 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Klik om mogelijkheden (zoals MSN, ICQ transporten) van jabber servers te zien"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Gebruik aanmelding"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Verbind zodra ik Afronden druk"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Wizard Account Aanmaken"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ik heb al een account die ik wil gebruiken"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Beheer..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Server Mogelijkheden"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 #, fuzzy
 msgid "Set my profile when I connect"
@@ -163,7 +162,6 @@ msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
@@ -176,31 +174,32 @@ msgstr ""
 "met het Jabber netwerk."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Jouw JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Hostnaam: "
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Poort:"
 
@@ -208,11 +207,6 @@ msgstr "_Poort:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Gebruikersnaam:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -221,18 +215,16 @@ msgstr "<b>Overige</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persoonlijke Informatie</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Account"
 
@@ -241,25 +233,24 @@ msgid "Account Modification"
 msgstr "Account Wijziging"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "_Administrator"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Verander Wachtwoord"
 
@@ -275,37 +266,35 @@ msgstr ""
 "gebruikt standaard al TLS waar mogelijk. Deze optie schakelt TLS echter uit."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Kies _Sleutel..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klik om het wachtwoord van de account te veranderen"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Verbinding"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -313,17 +302,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Algemeen"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Hostnaam: "
 
@@ -345,7 +331,6 @@ msgstr ""
 "stand te houden"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -355,7 +340,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -365,7 +349,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -381,43 +364,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informatie over jou, zoals op de server opgeslagen"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Geen"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Persoonlijke Informatie"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Poort: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_teit"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -428,7 +413,7 @@ msgstr ""
 "prioriteit wint."
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
@@ -437,13 +422,13 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "_Bron: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -457,30 +442,25 @@ msgstr ""
 "prioriteit bepaald dan wie berichten ontvangt. (zie hieronder)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Sla _wachtwoord op (onveilig)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Sla gespreks_logboek op voor alle contacten"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -491,22 +471,17 @@ msgid "Use _SSL (legacy)"
 msgstr "Gebruik _SSL (verouderd)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "bestandsoverdrachtlijst"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr ""
 
-#: ../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:13
 #, fuzzy
 msgid "_Name:"
 msgstr "_Naam: "
@@ -516,31 +491,38 @@ msgstr "_Naam: "
 msgid "<b>Proxy</b>"
 msgstr "<b>Eigenschappen</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Gebruik aanmelding"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Automatisch _verbinding maken als Gajim opstart"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Inschakelen"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 #, fuzzy
 msgid "First Name:"
 msgstr "Naam:"
@@ -551,7 +533,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -559,59 +540,98 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 #, fuzzy
 msgid "Last Name:"
 msgstr "Naam:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "Accounts _samenvoegen"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Her_noem"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Keep-alive-pakketten verzenden"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Synch_roniseer account status met globale status"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:52
 #, fuzzy
-msgid "Use custom port:"
+msgid "Use cust_om hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
+msgstr "Gebruik aangepaste hostnaam/poort"
+
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Wijzig Persoonlijke Informatie..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Inschakelen"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Hostnaam: "
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Beheer..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Poort:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
 msgid "A_ccount:"
@@ -810,7 +830,7 @@ msgid "All statuses"
 msgstr "Status: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Afwezig"
 
@@ -828,7 +848,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
@@ -838,7 +858,7 @@ msgid "Launch a command"
 msgstr "commando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
@@ -958,7 +978,7 @@ msgstr "Naam:"
 msgid "New entry received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../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 ""
 
@@ -1007,12 +1027,22 @@ msgstr "Geef nieuw wachtwoord op:"
 msgid "<b>Type your new status message</b>"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Actief"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Ruimte:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 #, fuzzy
 msgid "Preset messages:"
 msgstr "statusbericht"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Sla Bestand op als..."
@@ -1076,11 +1106,11 @@ msgstr "_Toevoegen aan Roster"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Geschiedenis"
 
@@ -1197,7 +1227,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Laat een popup zien als een bestandsoverdracht voltooid is"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Verder"
 
@@ -1234,7 +1264,7 @@ msgstr ""
 "Contact\n"
 "Vaandel"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Vetgedrukt"
 
@@ -1255,12 +1285,12 @@ msgstr "Gajim Themas Aanpassen"
 msgid "Gone"
 msgstr "Geen"
 
-#: ../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
 #, fuzzy
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Schuingedrukt"
 
@@ -1308,7 +1338,7 @@ msgstr "Verander _Onderwerp"
 msgid "Configure _Room..."
 msgstr "Configureer _Ruimte"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
@@ -1343,23 +1373,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Lid"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Eigenaar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stem"
 
@@ -1367,13 +1411,13 @@ msgstr "_Stem"
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Van"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 #, fuzzy
 msgid "Subject"
 msgstr "Onderwerp:"
@@ -1389,7 +1433,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:4
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
+#: ../src/dialogs.py:2908
 #, fuzzy
 msgid "Delete"
 msgstr "Wis MOTD"
@@ -1416,7 +1461,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Zoek"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
@@ -1437,7 +1482,7 @@ msgstr "_Zoek"
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
@@ -1465,8 +1510,8 @@ msgstr "Recent:"
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Binnengaan"
 
@@ -1497,7 +1542,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Print tijd:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1532,32 +1577,50 @@ msgstr "<b>Instellingen</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "HTTP Verbinden"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Naam:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Wachtwoord:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Type:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Gebruik aanmelding"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Poort:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Gebruik proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Gebruik aanmelding"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Gebruikersnaam:"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1597,17 +1660,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Klik om een emoticon in te voegen (Alt+E)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "Ver_stuur"
 
@@ -1715,11 +1783,15 @@ msgstr ""
 "onzichtbaar ben"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
 # deelnemen?
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1733,20 +1805,20 @@ msgstr ""
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1755,36 +1827,36 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1792,7 +1864,7 @@ msgid ""
 "display in chat windows."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1800,7 +1872,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1808,13 +1880,13 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1823,13 +1895,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -1837,13 +1909,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 "weergeven"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1852,7 +1924,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1861,7 +1933,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1869,7 +1941,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1877,7 +1949,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1885,14 +1957,14 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1903,20 +1975,20 @@ msgstr ""
 "lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
 "contacten niet op je rooster geblokkeerd"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1926,13 +1998,13 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1941,221 +2013,237 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Beheer..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Account Wijziging"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Alleen in _rooster weergeven"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Vastgelopen"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "T_heme:"
 msgstr "Thema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Gebruik _transport iconensets"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Beheer Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Binnenkomend bericht:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Uitgaand bericht:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "niet in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minuten"
 
@@ -2208,7 +2296,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr ""
 
@@ -2279,127 +2367,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Aangepast</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Afdeling:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Extra Adres:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familie:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Aangepast</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Homepage:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Aangepast</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Bijnaam:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefoonnummer:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Postcode:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Eigenschappen</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Geluiden</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Instellingen</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Instellingen</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Geluiden</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Info"
 
@@ -2409,18 +2497,18 @@ msgstr ""
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 #, fuzzy
 msgid "Personal Info"
 msgstr "Persoonlijke Informatie"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Werk"
 
@@ -2438,8 +2526,8 @@ msgstr "Verwijder account van Gajim en van de server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Verwijder"
 
@@ -2465,14 +2553,14 @@ msgstr "Wijzig _Groepen"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr ""
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr ""
 
@@ -2483,7 +2571,7 @@ msgstr "_Verwijder"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
@@ -2512,12 +2600,6 @@ msgstr "Start _Gesprek"
 msgid "_Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
@@ -2542,17 +2624,34 @@ msgstr "_Hernoem"
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "_Verder"
 
+#: ../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 "Wis MOTD"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+msgid "gtk-ok"
+msgstr ""
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2582,59 +2681,64 @@ msgstr "Profiel, Contactafbeelding"
 
 #: ../data/glade/roster_window.glade.h:9
 #, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "_Offline Contacten Weergeven"
+
+#: ../data/glade/roster_window.glade.h:10
+#, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transporten"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Accounts"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 #, fuzzy
 msgid "_View"
 msgstr "_Stem"
@@ -2655,12 +2759,12 @@ msgid "_Add contact"
 msgstr "_Contact Toevoegen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Contact Informatie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Zoek"
 
@@ -2751,10 +2855,6 @@ msgstr "Abonneringsverzoek"
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2781,10 +2881,6 @@ msgstr "Enkel _Bericht Verzenden"
 msgid "Show All Pending _Events"
 msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "_Rooster Weergeven"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2804,57 +2900,62 @@ msgstr "<b>Toepassingen</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Instellingen</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Bron:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Instellingen</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Beschrijving</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 #, fuzzy
 msgid "Comments"
 msgstr "Commentaar: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Configureer _Ruimte"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "_Inhoud"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Contact Informatie"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Meer"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "Kies een Contactafbeelding"
@@ -2867,6 +2968,11 @@ msgstr "<b>Jabber Verkeer</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Invoer</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Inschakelen"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2896,13 +3002,13 @@ msgstr "Wijs Open_PGP Sleutel toe"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Hernoem"
 
@@ -2927,31 +3033,26 @@ msgstr "Bron:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-#, fuzzy
-msgid "Modify Account"
-msgstr "Account Be_werken..."
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Contact Informatie"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2979,7 +3080,7 @@ msgstr "In de groep"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr ""
 
@@ -3004,230 +3105,267 @@ msgstr "(Niets)"
 msgid "Hidden"
 msgstr "Verborgen"
 
+#: ../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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "German"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Greek"
 msgstr "groen"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Croatian"
 msgstr "Locatie"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Italian"
 msgstr "Schuingedrukt"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Polish"
 msgstr "_Publiceren"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Algemeen"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "Onderstreept"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Uit_schoppen"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "Lettertype:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Contact Informatie"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "niet in het rooster"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr ""
 "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Gebruik aanmelding"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Gebruik aanmelding"
@@ -3235,33 +3373,33 @@ msgstr "Gebruik aanmelding"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3270,66 +3408,66 @@ msgstr ""
 "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, fuzzy, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Geen hulp beschikbaar voor /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3337,256 +3475,268 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s is een bestand, maar een map werd verwacht"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 sluit nu af"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s is een map, maar een bestand werd verwacht"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "Contact Informatie"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "_Verder"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "Beschrijving"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Groupsgesprek"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr ""
 "%(nickname)s in ruimte %(room_name)s heeft je een nieuw bericht gestuurd."
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "In de groep"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Groupsgesprek"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - één ongelezen bericht"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tijd in minuten waarna je statusbericht op afwezig ingesteld wordt"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Tijd in minuten waarna je statusbericht op niet beschikbaar ingesteld wordt."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Wis MOTD"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:121
+#: ../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:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Indien Aan, verwijder niet */_ . Zodat *abc* vetgedrukt wordt, maar zonder "
 "dat * * verwijdert wordt."
 
-#: ../src/common/config.py:128
+#: ../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:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:138
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3594,12 +3744,12 @@ msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hoeveel minuten zouden regels van het vorige gesprek onthouden moeten worden."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3607,11 +3757,11 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hoeveel regels op te slaan voor Ctrl+Omhoog"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3620,11 +3770,11 @@ msgstr ""
 "Óf een aangepaste url met %s erin verwerkt, waar %s is een woord/zin, óf "
 "'WIKTIONARY' wat betekent dat wiktionary gebruikt zal worden."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Indien aangevinkt zal Gajim bestuurd kunnen worden met gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3632,29 +3782,29 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:182
+#: ../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:184
+#: ../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:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3662,7 +3812,7 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3670,7 +3820,13 @@ msgid ""
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3679,34 +3835,28 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Volgens de IEC standaard is 1 KiB = 1024 bytes, 1 KB = 1000 bytes."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3714,12 +3864,12 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
@@ -3727,7 +3877,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3735,13 +3885,13 @@ msgstr ""
 "Indien Aan stopt Gajim zodra het venster gesloten wordt. Deze instelling is "
 "alleen geldig als het icoon in het notificatiegebied gebruikt wordt."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3749,7 +3899,7 @@ msgstr ""
 "Indien Aan zal Gajim een icoon op elke tab weergeven met ongelezen "
 "berichten. Afhankelijk van het thema kan dit icoon geanimeerd zijn."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3758,11 +3908,11 @@ msgstr ""
 "Indien Aan zal Gajim het statusbericht van contacten weergeven onder hun "
 "naam in het roostervenster, indien deze niet leeg is"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3770,7 +3920,7 @@ msgstr ""
 "Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
 "geen bekend is, of de laatste afbeelding te oud is."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3779,7 +3929,7 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3788,35 +3938,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../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 "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3824,7 +3974,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3836,52 +3986,52 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:250
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3890,268 +4040,294 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../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:256
+#: ../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:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../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 separately)"
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"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:278
+#: ../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:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 ""
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4160,151 +4336,181 @@ msgstr ""
 "Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
 "woorden in much_highlight_words bevat."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy
 msgid "Wrong host"
 msgstr "Wachtwoord"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "vCard publicatie is met succes afgerond"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "vCard publicatie is mislukt"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Ongeldige Jabber ID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Je staat niet in de ledenlijst"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../src/common/connection_handlers.py:2580
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4315,275 +4521,285 @@ msgstr ""
 "jabberstudio.org/ om het te verwijderen"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "Je zult verbonden worden met %s zonder OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Verbinding"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Opgeslagen in: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Verbinding"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fout tijdens versturen"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Het is onmogelijk lege bestanden te sturen"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4592,20 +4808,31 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "_Inhoud"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transporten"
 
@@ -4615,11 +4842,11 @@ msgid "Not in roster"
 msgstr "niet in het rooster"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python koppeling ontbreekt op deze computer"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogelijkheden van Gajim kunnen niet worden gebruikt"
 
@@ -4647,1659 +4874,1615 @@ msgid ""
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "one"
 msgstr "Geen"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "three"
 msgstr "Straat:"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "four"
 msgstr "Poort: "
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "five"
 msgstr "bestand"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "seven"
 msgstr "Gebeurtenis"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "nine"
 msgstr "_Verder"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 #, fuzzy
 msgid "eleven"
 msgstr "Wis MOTD"
 
+#. 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"
+msgid "%(0)s o'clock"
 msgstr ""
 
-#. 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 ""
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:44
+#, fuzzy
+msgid "five past %(0)s"
+msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:44
 #, fuzzy
-msgid "ten past $0"
+msgid "ten past %(0)s"
 msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "quarter past %(0)s"
+msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "twenty past %(0)s"
+msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "twenty five past %(0)s"
+msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:46
 #, fuzzy
-msgid "twenty five to $1"
+msgid "twenty five to %(1)s"
 msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:46
 #, fuzzy
-msgid "twenty to $1"
+msgid "twenty to %(1)s"
 msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "quarter to $1"
+msgid "quarter to %(1)s"
 msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "ten to $1"
+msgid "ten to %(1)s"
 msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "five to $1"
+msgid "five to %(1)s"
 msgstr "Registreer met %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 #, fuzzy
 msgid "Morning"
 msgstr "Werken"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 #, fuzzy
 msgid "Noon"
 msgstr "Geen"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 #, fuzzy
 msgid "Evening"
 msgstr "Gebeurtenis"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Aanwezig"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 #, fuzzy
 msgid "Owner"
 msgstr "_Eigenaar"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 #, fuzzy
 msgid "Member"
 msgstr "_Lid"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "is een bericht aan het typen..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bericht verzenden"
 msgstr[1] "Bericht verzenden"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/passwords.py:92
+#: ../src/common/passwords.py:123
 #, fuzzy, python-format
-msgid "Gajim account %s"
+msgid "XMPP account %s@%s"
 msgstr "voor account %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Gepauzeerd"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Vetgedrukt"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr ""
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Gesprek"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Vetgedrukt"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Inhoud"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Afgerond"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Inhoud"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Actief"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Wis MOTD"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr ""
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Groep"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "bericht"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Onzichtbaar"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "Geen"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Algemeen"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "Be_werk"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Groep"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "Wis MOTD"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Vastgelopen"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Naam:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "Uit_schoppen"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "Slapen"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Straat:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Abonneren"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Tijd"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "Onderstreept"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Wachtwoord"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Gebeurtenis"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "Werken"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "In de groep"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Gebeurtenis"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Binnengaan"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "Werken"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "Werken"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "Eten"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Eten"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Relaxing"
 msgstr "simpel"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "Eten"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Uitloggen"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "Eten"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "Eten"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr ""
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "Slapen"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "Eten"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "Eten"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "Verzenden"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "Werken"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Verbinding"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "Werken"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Om verdere berichten te versturen en ontvangen, moet je de verbinding "
 "opnieuw in stand brengen."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, fuzzy, python-format
 msgid "Error while adding service. %s"
 msgstr "fout tijdens versturen"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Actief"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Gebeurtenis"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Statusbericht"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Inschakelen"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Aangepast</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr ""
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Nieuw Bericht"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Nieuw Bericht"
-
-#: ../src/config.py:1057
-#, fuzzy
-msgid "Contact Connected"
-msgstr "Contactnaam"
-
-#: ../src/config.py:1058
-#, fuzzy
-msgid "Contact Disconnected"
-msgstr "Contact is Ingelogd"
-
-#: ../src/config.py:1059
-#, fuzzy
-msgid "Message Sent"
-msgstr "_Bericht"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr ""
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr ""
-
-#: ../src/config.py:1062
-#, fuzzy
-msgid "GMail Email Received"
-msgstr "Uitnodiging Ontvangen"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Naam"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Om de account naam te veranderen moet de verbinding verbroken zijn"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Beheer Accounts"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Ongeldige Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Een Jabber ID moet in de vorm \"gebruiker@servernaam\" zijn."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Er trad een probleem op bij het ophalen van je geheime OpenPGP sleutels."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Er is geen verbinding met de server"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Zonder verbinding is het niet mogelijk persoonlijke informatie aan te passen."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Je moet een account aanmaken voordat persoonlijke informatie kan worden "
 "aangepast."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2500
 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 ""
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Zorg ervoor dat de server- en ruimtevelden ingevuld zijn, of verwijder deze "
 "bladwijzer."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/config.py:3100
+#: ../src/config.py:2965 ../src/config.py:3213
 #, fuzzy
-msgid "Duplicate Jabber ID"
-msgstr "Ongeldige Jabber ID"
+msgid "Invalid server"
+msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3101
+#: ../src/config.py:2979
 #, fuzzy
-msgid "This account is already configured in Gajim."
-msgstr "Deze contact staat al op je rooster"
+msgid "Invalid room"
+msgstr "Ongeldige invoer"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6309,27 +6492,34 @@ msgstr ""
 "Je kunt geavanceerde accountopties instellen door op de Geavanceerd knop te "
 "drukken, of later via Accounts in het Bewerken menu van het hoofdvenster."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Je nieuwe account is met succes aangemaakt"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6339,7 +6529,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6347,31 +6537,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Je nieuwe account is met succes aangemaakt"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Actief"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Gebeurtenis"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr ""
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Nieuw Bericht"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Nieuw Bericht"
+
+#: ../src/config.py:3661
+#, fuzzy
+msgid "Contact Connected"
+msgstr "Contactnaam"
+
+#: ../src/config.py:3662
+#, fuzzy
+msgid "Contact Disconnected"
+msgstr "Contact is Ingelogd"
+
+#: ../src/config.py:3663
+#, fuzzy
+msgid "Message Sent"
+msgstr "_Bericht"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr ""
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr ""
+
+#: ../src/config.py:3666
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Uitnodiging Ontvangen"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6380,76 +6616,76 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "A_fsluiten"
+
+#: ../src/conversation_textview.py:709
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "\"%s\" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber IM Client"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6464,153 +6700,153 @@ msgstr "Contactnaam: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Groep"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "In de groep"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "SleutelID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Contactnaam"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Stel MOTD in"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusbericht"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Statusbericht"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Adres:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Extra Adres:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6619,99 +6855,99 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Bijnaam niet gevonden: %s"
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "Bijnaam niet gevonden: %s"
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Het is niet mogelijk aan een groepsgesprek deel te nemen zonder verbonden te "
 "zijn."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:1955
+#: ../src/dialogs.py:2180
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6721,285 +6957,311 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Van %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:2568
+#. 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 "Ik wil je graag toevoegen aan mijn contactlijst"
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Adres"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Be_werk"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Groep"
+
+#. 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 "Ik zou je graag aan mijn rooster willen toevoegen."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7007,38 +7269,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7048,59 +7310,59 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Overigen"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Zonder verbinding is het niet mogelijk te bladeren door aangebode services"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7108,318 +7370,342 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Dit soort service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "via account %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "commando"
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Bladwijzer bestaat al"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Ruimte \"%s\" heeft al een bladwijzer."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bladwijzer is met succes toegevoegd"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
+
+#: ../src/disco.py:1863
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "Geen"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Commando's: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP Versleuteling"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Binnenkomend bericht:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "_Geschiedenis"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "_Bericht"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Account Wijziging"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr ""
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "Binnenkomend bericht:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Algemeen"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Server Mogelijkheden"
@@ -7449,7 +7735,7 @@ msgstr "Grootte: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Jij"
 
@@ -7459,7 +7745,7 @@ msgid "Sender: %s"
 msgstr "Afzender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
@@ -7493,27 +7779,27 @@ msgstr "Fout bij lezen bestand:"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Bestandsoverdracht gestopt door andere gebruiker"
+msgid "File transfer stopped"
+msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
@@ -7533,34 +7819,34 @@ msgstr "Beschrijving: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr ""
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>Wat wil je doen?</b>"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -7596,53 +7882,53 @@ msgstr "Bestand: "
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7650,23 +7936,23 @@ msgid ""
 msgstr ""
 "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Controleer of gtk en pygtk ondersteuning hebben voor libglade op je systeem."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7674,36 +7960,45 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Je zult verbonden worden met %s zonder OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7714,148 +8009,185 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/gajim.py:571
+#: ../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 "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fout bij lezen bestand:"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Abonneringsverzoek"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Contact \"%s\" heeft je toestemming gegeven zijn status te zien."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Abonneer"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 is nu %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
+#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
+#: ../src/roster_window.py:3906
+#, fuzzy
+msgid "Do _not ask me again"
+msgstr "Vraag mij dit niet nogmaals"
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Je hebt ongelezen berichten"
 msgstr[1] "Je hebt ongelezen berichten"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7865,83 +8197,93 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Verwijdert contact van rooster"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fout bij lezen bestand:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Je hebt %(filename)s met succes van %(name)s ontvangen."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Je hebt %(filename)s met succes aan %(name)s gestuurd."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Vul de informatie in voor je nieuwe account</b>"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Bron: "
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7949,31 +8291,31 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Verbinding"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
@@ -7982,102 +8324,79 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "Vraag mij dit niet nogmaals"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Bladwijzer bestaat al"
-
-#: ../src/gajim.py:3001
-#, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Ruimte \"%s\" heeft al een bladwijzer."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Bladwijzer is met succes toegevoegd"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "laat hulp zien voor een specifiek commando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "commando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "laat hulp zien op commando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Laat een venster opduiken met het volgende ongelezen bericht"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8086,47 +8405,48 @@ msgstr ""
 "Drukt een lijst af van contacten in het rooster. Elke contact komt op een "
 "aparte regel"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "account"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "geef alleen contacten weer van de gegeven account"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Drukt een lijst van geregistreerde accounts af"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Verander de status van de account of accounts"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "bericht"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusbericht"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8135,23 +8455,27 @@ msgstr ""
 "status van alle accounts te veranderen die synchroniseren met de globale "
 "status"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Laat het gespreksvenster zien zodat je berichten kunt versturen aan een "
 "contact"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID van de contact waar je me in gesprek wilt gaan"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "Indien opgegeven zal contact van de contactlijst van deze account gehaald "
 "worden"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8162,30 +8486,30 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp sleutel"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "indien opgegeven zal het bericht versleuteld worden met deze publieke sleutel"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "indien opgegeven zal het bericht verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8196,120 +8520,120 @@ msgstr ""
 "sleutel als account zijn optioneel. Als je alleen 'account' wilt opgeven "
 "zonder 'OpenPGP sleutel', zet 'OpenPGP sleutel' dan op ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "subject"
 msgstr "Onderwerp:"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "message subject"
 msgstr "_Bericht"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID of contact die het bericht zal ontvangen"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID van contact"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Haal gedetaileerde informatie op over een contact"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 #, fuzzy
 msgid "Name of the account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "bestand"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Bestandspad"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "indien opgegeven zal bestand verstuurd worden met deze account"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Laat alle voorkeuren zien en hun waarden"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Zet waarde van 'sleutel' op 'waarde'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "sleutel=waarde"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'key' is de naam van de voorkeur, 'waarde' is de waarde die zal worden "
 "ingesteld"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Verwijdert een voorkeur onderdeel"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "sleutel"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "naam van de voorkeur die verwijderd zal worden"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Schrijft de huidige staat van de Gajim voorkeuren weg naar het .config "
 "bestand"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Voegt contact toe aan rooster"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Voegt een nieuwe contact toe aan deze account"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -8317,104 +8641,109 @@ msgstr ""
 "Retourneert huidige status (de globale status, tenzij een account is "
 "opgegeven)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 #, fuzzy
 msgid "XML to send"
 msgstr "XML Console"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "inhoud bericht"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "Nieuwe Ruimte _Binnengaan"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "Van"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Ruimte:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "Uit_schoppen"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8423,31 +8752,31 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8456,7 +8785,7 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8465,7 +8794,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8474,7 +8803,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Wachtwoord"
@@ -8493,179 +8822,182 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "thema naam"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Je kunt je huidige thema niet verwijderen"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Verbinding"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aansluiting: "
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s is uit de ruimte geschopt door %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Ongeldige gebruikersnaam"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Bijnaam niet gevonden: %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 ""
 "Gebruik: /%s <bijnaam|JID> [reden], verbant de JID uit de ruimte. De bijnaam "
 "van een aanwezige gebruiker mag gebruikt worden, maar niet als deze een \"@"
 "\" bevat. Als de JID zich momenteel in de ruimte bevindt, zal hij eruit "
 "geschopt worden. Ondersteunt GEEN spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8674,7 +9006,7 @@ msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8683,7 +9015,7 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8692,7 +9024,7 @@ msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8701,18 +9033,17 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1683
+#: ../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 ""
 "Gebruik: /%s <bijnaam> [reden], verwijdert de gebruiker met de opgegeven "
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8721,88 +9052,102 @@ msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Gebruik: /%s [onderwerp], geeft het huidige onderwerp weer, of werkt het "
 "onderwerp bij naar de opgegeven tekst."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Gebruik: /%s <bericht>, stuurt een bericht zonder naar commando's te zoeken."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Gebruik: /%s <bijnaam>, verandert je bijnaam in de huidige ruimte."
+
+#: ../src/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Weet je zeker dat je de ruimte \"%s\" wilt verlaten?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Als je dit venster sluit zal de verbinding verbroken worden met deze ruimte."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8833,86 +9178,86 @@ msgstr "Details"
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Fout bij verwerken bestand:"
 
 #. 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 ""
 "Kan niet naar %s schrijven. Sessiebeheer ondersteuning werkt mogelijk niet"
 
 #. 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 ""
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Wil je het overschrijven?"
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logboek database wordt aangemaakt"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 #, fuzzy
 msgid "Contacts"
 msgstr "_Inhoud"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../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:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam:"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "_Bericht"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8921,181 +9266,191 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:549
+#: ../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] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:585
+#: ../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] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Gespreksgeschiedenis van %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s is nu %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status is nu: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Er is geen verbinding met de server"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/message_window.py:448
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:273
+#: ../src/notify.py:285
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Algemeen"
+msgid "Ignore"
+msgstr "_Verder"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Bestandspad"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Die ruimte bestaat niet."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 #, fuzzy
 msgid "Information received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie te publiceren zonder verbinding."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9103,52 +9458,46 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Als \"%s\" dit verzoek aanneemt zal je zijn status kunnen ontvangen."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9157,15 +9506,28 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Weet je zeker dat je de ruimten \"%s\" wilt verlaten?"
+
+#: ../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 "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9174,16 +9536,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9192,12 +9554,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9207,55 +9569,60 @@ msgstr ""
 "contacten via deze transport"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9265,12 +9632,12 @@ msgstr ""
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9278,17 +9645,17 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat deze contact mijn status blijf zien na verwijdering"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9297,27 +9664,27 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9325,161 +9692,162 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3786
+#: ../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 "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ongeldig Bestand"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s wil je een bestand sturen:"
 msgstr[1] "%s wil je een bestand sturen:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Stuur %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Stuurt een bestand aan contact"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "via account %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Actief"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "To all online users"
 msgstr "_Online Gebruikers"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Ik zou je graag aan mijn rooster toe willen voegen"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Inhoud"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transporten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transporten"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contact is Ingelogd"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Groupsgesprek"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
@@ -9496,20 +9864,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Onderwerp: %s\n"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9519,7 +9887,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9529,130 +9897,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 #, fuzzy
 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 "Bron: "
 
-#: ../src/tooltips.py:335
+#: ../src/tooltips.py:334
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../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
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Verbinding"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contact is Ingelogd"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Ruimte:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Actief"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Type:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../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"
@@ -9668,17 +10026,22 @@ msgstr "?Client:Onbekend"
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Client:Onbekend"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9686,7 +10049,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9694,33 +10057,87 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Jij en de contact zijn beide geïnteresseert in elkaars aanwezigheid"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Jij en de contact zijn beide niet geïnteresseert in elkaars aanwezigheid"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Je bent aan het wachten op bevestiging van jou op abonnement op deze contact"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP Versleuteling"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Klik om mogelijkheden (zoals MSN, ICQ transporten) van jabber servers te "
+#~ "zien"
+
+#~ msgid "Servers Features"
+#~ msgstr "Server Mogelijkheden"
+
+#~ msgid "Your JID:"
+#~ msgstr "Jouw JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Naam:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "_Rooster Weergeven"
+
+#, fuzzy
+#~ msgid "Modify Account"
+#~ msgstr "Account Be_werken..."
+
+#, fuzzy
+#~ msgid "Gajim account %s"
+#~ msgstr "voor account %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Aangepast</b>"
+
+#, fuzzy
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Ongeldige Jabber ID"
+
+#, fuzzy
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Deze contact staat al op je rooster"
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Bestandsoverdracht gestopt door andere gebruiker"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Algemeen"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Actief"
 
 #, fuzzy
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
@@ -9750,9 +10167,6 @@ msgstr " bron met prioriteit"
 #~ msgid "_Retype Password:"
 #~ msgstr "_Wachtwoord:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Gebruik proxy"
-
 #~ msgid ""
 #~ "If you have 2 or more accounts and it is checked, Gajim will list all "
 #~ "contacts as if you had one account"
@@ -9889,10 +10303,6 @@ msgstr " bron met prioriteit"
 #~ msgid "_Before time:"
 #~ msgstr "Voor tijdsstempel:"
 
-#, fuzzy
-#~ msgid "_Font:"
-#~ msgstr "Lettertype:"
-
 #~ msgid "_Never"
 #~ msgstr "_Nooit"
 
@@ -10044,10 +10454,6 @@ msgstr " bron met prioriteit"
 #~ msgstr "Van %s in ruimte %s"
 
 #, fuzzy
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Stuurt een bestand aan contact"
-
-#, fuzzy
 #~ msgid "Affiliation:"
 #~ msgstr "Aansluiting: "
 
@@ -10105,10 +10511,6 @@ msgstr " bron met prioriteit"
 #~ "geldig als notify_on_all_muc_messages aan staat)"
 
 #, fuzzy
-#~ msgid "Add"
-#~ msgstr "Adres"
-
-#, fuzzy
 #~ msgid "Away "
 #~ msgstr "Afwezig"
 
@@ -10134,9 +10536,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ongeldige gebruikersnaam"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "vCard publicatie is met succes afgerond"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Je persoonlijke informatie is met succes gepubliceerd."
 
@@ -10196,10 +10595,6 @@ msgstr " bron met prioriteit"
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s heeft je een nieuw bericht gestuurd."
 
-#, fuzzy
-#~ msgid "GUI Migration failed"
-#~ msgstr "vCard publicatie is mislukt"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Logboeken zijn met succes omgezet naar de database."
 
@@ -10258,9 +10653,6 @@ msgstr " bron met prioriteit"
 #~ msgid "account: "
 #~ msgstr "account: "
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Weet je zeker dat je de ruimten \"%s\" wilt verlaten?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Als je dit venster sluit zal de verbinding verbroken worden met deze "
diff --git a/po/no.po b/po/no.po
index 5d38419f8..8d63d2663 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,10 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-05 18:31+0100\n"
-"PO-Revision-Date: 2008-12-05 15:51+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:58+0200\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
-"Language-Team: \n"
+"Language-Team:  <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,7 +38,7 @@ msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
@@ -59,7 +59,7 @@ msgid "_Personal Events"
 msgstr "_Personlige Hendelser"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Start Samtale..."
 
@@ -91,6 +91,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Vennligst velg 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"
@@ -98,60 +102,54 @@ msgstr ""
 "Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Bruk autentisering"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg ønsker å _bruke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Server Funksjonalitet"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
@@ -164,30 +162,31 @@ msgstr ""
 "til Jabber nettverket."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Din JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Maskinnavn:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Passord:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -195,11 +194,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Brukernavn:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -208,18 +202,16 @@ msgstr "<b>Diverse</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Konto"
 
@@ -228,23 +220,22 @@ msgid "Account Modification"
 msgstr "Konto Endring"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administrators oppgaver"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Koble til automatisk når kontakten mistes"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
@@ -261,37 +252,35 @@ msgstr ""
 "deaktivert."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Tilkobling"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
 #. 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:1034
-#: ../src/common/helpers.py:1046 ../src/notify.py:516 ../src/notify.py:547
-#: ../src/notify.py:559
+#: ../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"
 
@@ -299,17 +288,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2654
-#: ../src/roster_window.py:5137
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Generelle"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
@@ -332,7 +318,6 @@ msgstr ""
 "tidsavbrudd som resulterer i frakobling"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -342,7 +327,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -352,7 +336,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -367,43 +350,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1551
-#: ../src/config.py:2051
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1141
-#: ../src/config.py:1212 ../src/config.py:1459 ../src/config.py:1464
-#: ../src/config.py:1959 ../src/config.py:2037 ../src/config.py:2050
-#: ../src/config.py:3141 ../src/config.py:3209 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:522 ../src/roster_window.py:2723
-#: ../src/roster_window.py:2729 ../src/roster_window.py:2734
+#: ../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:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -414,7 +399,7 @@ msgstr ""
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
@@ -423,12 +408,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Ressur_s:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -443,30 +428,25 @@ msgstr ""
 "hendelsene. (se under)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "_Synkroniser kontakter"
@@ -476,21 +456,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Bruk filoverførings proxier"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Justér etter 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:13
 msgid "_Name:"
 msgstr "_Navn:"
 
@@ -498,11 +473,21 @@ msgstr "_Navn:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proxy</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Justér etter status"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Kontoer"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Bruk autentisering"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -510,21 +495,18 @@ msgstr ""
 "Velg denne slik at Gajim vil spør deg før sending av passordet over en "
 "usikker tilkobling"
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_oble til når Gajim starter"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Slå på"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Fornavn:"
 
@@ -533,7 +515,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -544,56 +525,98 @@ msgstr ""
 "Du kan også vurdere å endre mulige brannmur innstillinger."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:678
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Etternavn:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Sammenslåin_g av kontoer"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5088
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Send hold-i-live meldinger"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Synk_roniser konto status med global status"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Bruk GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Bruk egendefinert maskinnavn/port"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Bruk egendefinert port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Rediger Personlig Informasjon..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Slå på"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "_Maskinnavn:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Behandle..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Advar før benyttelse av en usikker tilkobling"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "bruk HTTP_PROXY system variabel"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-tilføy"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-lukk"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-fjern"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "bruk HTTP_PROXY system variabel"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Konto"
@@ -778,7 +801,7 @@ msgid "All statuses"
 msgstr "Alle statuser"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:290
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Borte"
 
@@ -795,7 +818,7 @@ msgid "Have "
 msgstr "Har"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Usynlig"
 
@@ -804,7 +827,7 @@ msgid "Launch a command"
 msgstr "Kjør en kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
@@ -925,7 +948,7 @@ msgstr "Sist endret:"
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../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 "Du har mottatt en ny inntreden:"
 
@@ -969,11 +992,19 @@ msgstr "Skriv inn nytt passord:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Skriv inn din nye status melding:</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 "Forvalgte meldinger:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Lagre som Forvalg..."
 
@@ -1033,11 +1064,11 @@ msgstr "_Legg til Kontaktliste"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5784
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historie"
 
@@ -1181,7 +1212,7 @@ msgstr ""
 "Kontakt rad\n"
 "Samtale Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:748
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Fet"
 
@@ -1201,11 +1232,11 @@ msgstr "Gajim Tema Valg"
 msgid "Gone"
 msgstr "Borte"
 
-#: ../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:749
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1253,7 +1284,7 @@ msgstr "Endre _Tittel..."
 msgid "Configure _Room..."
 msgstr "Konfigurer _Rom..."
 
-#: ../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 "_Bokmerke"
 
@@ -1285,23 +1316,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../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 "_Blokker"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Kast 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 "_Eier"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../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 "_Frigi"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Stemme"
 
@@ -1309,13 +1354,13 @@ msgstr "_Stemme"
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:315
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tittel"
 
@@ -1333,7 +1378,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Velkommen til Gajims Historikk og Logg Behandler</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 "Slett"
 
@@ -1363,7 +1409,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:314
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
@@ -1386,7 +1432,7 @@ msgstr "Søk:"
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../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 "Bli med i Gruppesamtale"
 
@@ -1413,8 +1459,8 @@ msgstr "Nylig:"
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1198
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Bli med"
 
@@ -1442,7 +1488,7 @@ msgstr "Minimer ved Automatisk Deltakelse"
 msgid "Print status:"
 msgstr "Skriv 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:"
 
@@ -1471,36 +1517,56 @@ msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP Connect\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Navn:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Skriv:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Bruk autentisering"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Maskin:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Bruk proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Bruk autentisering"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "_URL:"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Skriv:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Brukernavn:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1550,7 +1616,7 @@ msgstr "Vis 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 "_Send"
 
@@ -1647,10 +1713,14 @@ msgstr ""
 "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1664,19 +1734,19 @@ msgstr ""
 "Alltid bruk Xfce standard applikasjoner\n"
 "Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1690,31 +1760,31 @@ msgstr ""
 "Frakoblet kontaktliste med samtaler gruppert etter konto\n"
 "Frakoblet kontaktliste med samtaler gruppert etter type"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1724,7 +1794,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1734,7 +1804,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1742,11 +1812,11 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1754,20 +1824,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Dersom valgt vil Gajim endre status til Borte når maskinen ikke brukes."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1775,7 +1845,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1783,7 +1853,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1791,25 +1861,25 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise aktivitet for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
 "vinduet"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1819,7 +1889,7 @@ msgstr ""
 "Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
 "språkvalg brukes for denne kontakten eller gruppesamtale."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1829,7 +1899,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1839,14 +1909,14 @@ msgstr ""
 "husk at når man bruker E2E kryptering må den andre parten være enig i at "
 "logging er OK, ellers vil ikke beskjeder logges."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1855,7 +1925,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1863,7 +1933,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1871,43 +1941,50 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1917,19 +1994,24 @@ msgstr ""
 "Varsle meg om det\n"
 "Vis bare i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "_Vis hendelse i systemstatusfeltet"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1937,139 +2019,145 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:397
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Automatisk borte status melding. Dersom tom vil Gajim ikke endre gjeldende "
 "status melding"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Automatisk ikke tilgjengelig meldingen. Dersom tom vil Gajim ikke endre "
 "gjeldende status melding"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Innkommende melding:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Utgående melding:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutter"
 
@@ -2117,7 +2205,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2565
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
@@ -2182,108 +2270,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Avdeling:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-Post:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Ekstra Adresse:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Etternavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullt Navn</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Fornavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Hjemmeside:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellomnavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Navn:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Kallenavn:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Telefonnummer:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stilling:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Post Kode:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Rolle:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Stat:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gate:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffiks:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Om"
 
@@ -2293,17 +2381,17 @@ msgstr "Klikk for å sette ditt kontaktbilde"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Personlig Info"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Jobb"
 
@@ -2321,8 +2409,8 @@ msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5125
-#: ../src/roster_window.py:5603 ../src/roster_window.py:5732
+#: ../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 "_Fjern"
 
@@ -2344,14 +2432,14 @@ msgstr "Rediger _Grupper..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5675
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5556
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "In_viter til"
 
@@ -2361,7 +2449,7 @@ msgstr "_Fjern"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5053 ../src/roster_window.py:5641
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
@@ -2386,12 +2474,6 @@ msgstr "Start _Samtale"
 msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5116 ../src/roster_window.py:5593
-#: ../src/roster_window.py:5722
-msgid "_Block"
-msgstr "_Blokker"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Forby han/henne å se min status"
@@ -2413,16 +2495,34 @@ msgstr "_Gi nytt navn..."
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5587
-#: ../src/roster_window.py:5719
-msgid "_Unblock"
-msgstr "_Frigi"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Ikke ignorer"
 
+#: ../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 "gtk-lukk"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-lukk"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Legg til _Kontakt..."
@@ -2448,56 +2548,62 @@ msgid "Profile, A_vatar"
 msgstr "Profil, B_ilde"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Vis _Frakoblede Kontakter"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
-msgstr "Vis _kontaktliste"
-
 #: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Vis _Kontaktliste"
+
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Kontoer"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1352
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "_Send Enkelt Melding..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Vis"
 
@@ -2514,11 +2620,11 @@ msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5744
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1210
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Søk"
 
@@ -2606,10 +2712,6 @@ msgstr "Abonnerings Forespørsel"
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Velg hvilken konto du skal synkronisere med"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Velg hvilken konto du du ønsker å synkronisere med"
@@ -2634,10 +2736,6 @@ msgstr "Send _Melding"
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Vis _Kontaktliste"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2655,49 +2753,54 @@ msgstr "<b>Spør:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Stat:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abbonement:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurert avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Bruker avatar:"
 
@@ -2709,6 +2812,11 @@ msgstr "<b>Jabber Trafikk</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Slå på"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2737,13 +2845,13 @@ msgstr "Tilegn Open_PGP Nøkkel"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5702
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
@@ -2767,29 +2875,25 @@ msgstr "Ressurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Rediger Konto"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../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 er i ferd med å eksekvere en kommando. Ønsker du å avbryte den?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Tjenesten endret sesjons identifikasjon. "
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Tjenesten endret sesjons identifikasjon. "
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
@@ -2814,7 +2918,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:768
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Farge"
 
@@ -2839,175 +2943,199 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Gjemt"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Du har mottatt en ny inntreden:"
+
 #. 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 "Engelsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretagner"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Tysk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Brtisk"
 
-#: ../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 "Spansk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Fransk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Kroatisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italiensk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norsk (b)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Nederlansk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polsk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugisisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brasiliansk Portugisisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovakisk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Svensk"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:335
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:358 ../src/chat_control.py:551
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:359 ../src/chat_control.py:552
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/chat_control.py:750
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Udefinert"
 
-#: ../src/chat_control.py:751
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Syk"
 
-#: ../src/chat_control.py:774
+#: ../src/chat_control.py:796
 #, fuzzy
 msgid "Font"
 msgstr "_Font:"
 
-#: ../src/chat_control.py:783
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktinformasjon"
 
-#: ../src/chat_control.py:1214 ../src/chat_control.py:1616
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Virkelig send fil?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1243 ../src/chat_control.py:2110
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:72
-#: ../src/common/helpers.py:302 ../src/conversation_textview.py:860
-#: ../src/dialogs.py:903 ../src/gajim.py:982 ../src/gajim.py:1642
-#: ../src/normal_control.py:483 ../src/roster_window.py:911
-#: ../src/roster_window.py:1537 ../src/roster_window.py:1539
-#: ../src/roster_window.py:1870 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3115 ../src/roster_window.py:5237
-#: ../src/roster_window.py:5422
+#: ../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 "ikke i kontaktliste"
 
-#: ../src/chat_control.py:1375 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "En liste over aktive, komplette og stoppede fil overføringer"
+
+#: ../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 "Ukjent Artist"
 
-#: ../src/chat_control.py:1377 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/chat_control.py:1379 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/chat_control.py:1383 ../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"
@@ -3016,26 +3144,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> etter <i>%(artist)s</i>\n"
 "fra  <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1388
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s etter %(artist)s\n"
-"fra %(source)s"
-
-#: ../src/chat_control.py:1511
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s fra gruppesamtale %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1596 ../src/dialogs.py:3907
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1597
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3043,50 +3162,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1606
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1631
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1633
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1647
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1649
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "og IKKE autentisert"
 
 #. 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:1663
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3095,26 +3214,26 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:1711
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Kommando ikke støttet for zeroconf konto."
 
-#: ../src/chat_control.py:1722 ../src/groupchat_control.py:1651
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/chat_control.py:1725 ../src/groupchat_control.py:1665
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/chat_control.py:1728 ../src/groupchat_control.py:1670
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Bruk: /%s, gjemmer samtale knappene."
 
-#: ../src/chat_control.py:1731 ../src/groupchat_control.py:1686
+#: ../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 "
@@ -3123,38 +3242,38 @@ msgstr ""
 "Bruk: /%(command)s <action>, sender handling til gjeldende rom. Bruk tredje "
 "person. (f.eks.  /%(command)s eksploderer.)"
 
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Bruk: /%s, sender en ping til kontakten"
 
-#: ../src/chat_control.py:1739
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Bruk: /%s, sender meldingen til kontakten"
 
-#: ../src/chat_control.py:1742 ../src/groupchat_control.py:1709
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
-#: ../src/chat_control.py:1874
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:1881
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:1884
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:1886
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:1891
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3162,25 +3281,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:1893
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:1921 ../src/chat_control.py:1934
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:1927
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Den følgende meldingen ble kryptert"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2298
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2299
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3188,15 +3307,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2447 ../src/common/connection_handlers.py:1846
-#: ../src/common/connection_handlers.py:1892
-#: ../src/common/connection_handlers.py:2080
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1217
-#: ../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 "Database feil"
 
-#: ../src/chat_control.py:2448
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3205,7 +3324,7 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2684
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
@@ -3214,156 +3333,168 @@ msgstr "%(name)s er nå %(status)s"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../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 er en fil men skulle ha vært 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 vill nå lukkes"
 
-#: ../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 er en katalog men skulle vært en fil"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Endre status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Sett fraværstype og beskrivelse"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Frakoblet - ikke kontakt"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Gå ut av Gruppesamtale"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Du har ikke blitt med i en gruppesamtale."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Velg hvilke samtalegrupper du ønsker å forlate"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:72 ../src/roster_window.py:785
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:5013
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Gruppesamtaler"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Bruk D-Bus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minutter før status endres til borte."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Borte på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S vil bli byttet ut med gjeldende status melding, $T av automatisk borte "
 "tid. "
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minutter før status endres til ikke tilgjengelig."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Ikke tilgjengelig på grunn av inaktivitet i mer enn $T min)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S vil bli byttet ut med gjeldende status melding, $T av auoxa tid."
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:452
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3130
+#: ../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:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Slå på link-lokal/zeroconf meldinger"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Språk som brukes av ordlisten"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3373,7 +3504,7 @@ msgstr ""
 "'sometimes' - vis klokkeslett hvert print_ichat_every_foo_minutes minutt.\n"
 "'never' - aldri vis klokkeslett."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3383,18 +3514,18 @@ msgstr ""
 "4, eller 0 for å deaktivere fuzzyclock. 1 er den mest presise klokken, 4 er "
 "den mindre presise. Dette brukes bare dersom print_time er 'sometimes'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ par som mulige formaterings symboler."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Dersom True, ikke fjern */_ . Så *abc* vil bli uthevet men * * ikke vil bli "
 "fjernet."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3405,7 +3536,7 @@ msgstr ""
 "docs/ref/rst/restructuredtext.html (Dersom du ønsker å bruke dette, må du "
 "installere docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3413,7 +3544,7 @@ msgstr ""
 "Tegn å legge til etter kallenavn når du bruker kallenavn fullføring (tab) i "
 "gruppesamtaler."
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3421,7 +3552,7 @@ msgstr ""
 "Tegnforslag å legge til nytt kallenavn når det ønskede kallenavnet er "
 "opptatt av noen andre i samtalegruppen."
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3432,19 +3563,19 @@ msgstr ""
 "strftime for å se fullstendig beskrivelse: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tegn som skrives før kallenavnet i samtaler"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tegn som skrives etter kallenavnet i samtaler"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3452,12 +3583,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hvor mange minutter skal de siste linjene fra forrige konversasjon vare."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3465,11 +3596,11 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hvor mange linjer skal lagres for Ctrl+PilOPP."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3478,11 +3609,11 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Dersom valgt vil Gajim kunne bli fjernstyr med gajim-remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3494,12 +3625,12 @@ msgstr ""
 "at de synkroniserer med global status) basert på statusen til nettverks "
 "tilkoblingen."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "Sendt samtale status melding. Kan være alle, bare_skriving, avslått."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3507,7 +3638,7 @@ msgstr ""
 "Vist samtale status melding i samtalevindu. Kan være alle, bare_skriving, "
 "avslått."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3515,11 +3646,11 @@ msgstr ""
 "Når man ikke viser klokkeslett for hver melding (print_time==av-og-til), vis "
 "det hvert x minutt."
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3527,7 +3658,7 @@ msgstr ""
 "Spør alltid før lukking av gruppesamtale fane/vindu i denne mellomrom "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3535,7 +3666,13 @@ msgstr ""
 "Aldri spør før lukking av gruppesamtale fane/vindu i denne mellomroms "
 "separerte listen av rom jider."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3544,35 +3681,27 @@ msgstr ""
 "grensesnitt, for Fil Overføring i tilfelle adresse oversetting/port "
 "videresending."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Varsle om hendelser i system-statusfelt ikonet."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Vis notatblokk faner i samtalevinduer?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
-"meldinger skal logges?"
-
-#: ../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 "
@@ -3583,16 +3712,16 @@ msgstr ""
 "separert med komma. Gyldige grupper er 1, 2, 5, 14, 15, 16, 17 og 18. Høyere "
 "nummer er mer sikre men tar lenger å kalkulere når du starter en sesjon. "
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Forhåndsvik nye meldinger i popup vindu?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolon-delt liste av ord som vil bli uthevet i gruppesamtaler."
 
-#: ../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."
@@ -3600,14 +3729,14 @@ msgstr ""
 "Dersom True vil Gajim avslutte når X knappen i Vindubehandleren blir trykket "
 "på. Dette valget vil kun brukes dersom systemstatus ikon er i bruk. "
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Dersom True vil Gajim sjekke om den er standard jabber klient ved hver "
 "oppstart."
 
-#: ../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."
@@ -3615,7 +3744,7 @@ msgstr ""
 "Dersom True vil Gajim ise et ikon på hver fane som inneholder uleste "
 "meldinger. Avhengig av valgte tema kan dette ikonet være animert."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3623,12 +3752,12 @@ msgstr ""
 "Dersom True vil Gajim vise status meldingen, om den ikke er tom, for hver "
 "kontakt under kontaktens navn i kontaktliste vinduet."
 
-#: ../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 ""
 "Definer posisjo for avatar i kontaktlisten. Kan være venste eller høyre"
 
-#: ../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."
@@ -3636,7 +3765,7 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3644,7 +3773,7 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../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 "
@@ -3657,29 +3786,29 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget på."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrunnsfargen for kontakter når de akkurat har logget 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 ""
 "Dersom True vil gjenopprettede meldinger bruke en mindre font en standard."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../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 "
@@ -3689,7 +3818,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3700,7 +3829,7 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3721,31 +3850,31 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Dersom False vil du ikke lenger se bildeikoner i samtalevinduet."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Dersom True vil man kunne lukke fane/vindu med escape knappen."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../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."
@@ -3753,15 +3882,15 @@ msgstr ""
 "I en samtale, vis kallenavnet i starten av linjen bare når det ikke er den "
 "samme person som snakker som i den forrige meldingen."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3769,11 +3898,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab går til neste skrivefane når ingenting er ulest."
 
-#: ../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."
@@ -3781,7 +3910,7 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../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 "
@@ -3791,7 +3920,7 @@ msgstr ""
 "kontoinnstillingene. VÆR FORSIKTIG, når du er logget inn med en negativ "
 "prioritet vil du ikke motta noen meldinger fra din server."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3799,7 +3928,16 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
+"konto passord."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3807,7 +3945,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../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"
@@ -3815,7 +3953,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../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."
@@ -3823,7 +3961,7 @@ msgstr ""
 "Dersom Sant vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../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."
@@ -3831,18 +3969,18 @@ msgstr ""
 "Dersom Sant vil Gajim konvertere mellom $$ og $$ til et bilde med dvips og "
 "konvertere før innsetting i et samtale vindu."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../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 ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3850,11 +3988,11 @@ msgstr ""
 "Dersom Sant vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../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."
@@ -3862,16 +4000,22 @@ msgstr ""
 "Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
 "er større."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Lovlige uri skjema. Bare skjema i denne listen vil bli aksepterte som en "
 "\"ekte\" uri."
 
-#: ../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."
@@ -3879,7 +4023,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../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"
@@ -3888,26 +4032,26 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../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 ""
 "Dersom deaktivert, ikke signer tilstedeværelser med GPG nøkkel, selv om GPG "
 "er konfigurert."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Skal Gajim automatisk starte en kryptert sesjon når mulig?"
 
-#: ../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"
@@ -3915,34 +4059,43 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Vis en advarsels dialog før bruk av standard SSL bibliotek."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../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
+#, fuzzy
 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 ""
 "Hvor mange sekunder ventes svar på keepalive pakke før vi prøver å koble til "
 "på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../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."
@@ -3950,19 +4103,27 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:393
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
+"meldinger skal logges?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3970,101 +4131,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:395 ../src/common/config.py:398
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:406 ../src/common/config.py:408
-#: ../src/common/config.py:409 ../src/common/config.py:412
-#: ../src/common/config.py:413
+#: ../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:419 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:421 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:423 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:431 ../src/config.py:1391
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:434 ../src/common/config.py:435
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4073,68 +4234,99 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:459 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:72
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Feil maskinnavn"
 
-#: ../src/common/connection_handlers.py:235
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Ugyldig lokal adresse? :-O"
 
-#: ../src/common/connection_handlers.py:640
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings informasjon for transport %s har ikke kommet tidsnok"
 
-#: ../src/common/connection_handlers.py:927
-#: ../src/common/connection_handlers.py:1844
-#: ../src/common/connection_handlers.py:1890
-#: ../src/common/connection_handlers.py:2078
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1215
-#: ../src/gajim.py:399
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "vCard publisering vellykket"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "vCard publisering feilet"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1134 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1135 ../src/common/connection.py:850
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1218
-#: ../src/gajim.py:178
+#: ../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 "Ugyldig Jabber ID"
+
+#: ../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: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."
@@ -4143,78 +4335,77 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den (se http://trac.gajim."
 "org/wiki/DatabaseBackup) eller fjern den (all historikk vil bli borte)."
 
-#: ../src/common/connection_handlers.py:1965
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2040
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2046
-#: ../src/common/connection_handlers.py:2049
-#: ../src/common/connection_handlers.py:2053 ../src/gajim.py:562
+#: ../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 "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2041
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2044
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2047
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2050
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2096
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2103
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2130
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2151
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2153
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2155
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4225,15 +4416,15 @@ msgstr ""
 "fjerne den"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1920 ../src/roster_window.py:1940
+#: ../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 vil bli tilkoblet til %s uten OpenPGP."
@@ -4366,73 +4557,78 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:267
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:268
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:313
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:326
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:342
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarte feil på registrerings forespørselen: %(error)s"
 
-#: ../src/common/connection.py:523
-msgid "Connection to proxy failed"
-msgstr "Tilkobling til proxy feilet"
-
-#: ../src/common/connection.py:611 ../src/common/connection.py:712
-#: ../src/common/connection.py:1350
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:612 ../src/gajim.py:1059
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Lagret i: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Tilkobling til proxy feilet"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:645 ../src/common/connection.py:693
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Tilkobling til konto %s har blitt mistet. Prøv igjen."
 
-#: ../src/common/connection.py:667
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Påliteligheten til sertifikatet %s kan være ugyldig."
 
-#: ../src/common/connection.py:670
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4441,7 +4637,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:672
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4450,24 +4646,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:713
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:738
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:740
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:802
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4476,13 +4672,18 @@ msgstr ""
 "Privatlivs listen %s har ikke blitt fjernet. Den er kanskje aktiv i en av "
 "dine tilkoblede ressurser. Deaktiver den og prøv igjen."
 
-#: ../src/common/connection.py:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 er ikke mulig å sende tomme filer"
+
+#: ../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 "Enten er ikke en nøkkel tildelt ellers har ikke kontakten signert."
 
-#: ../src/common/connection.py:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 ""
@@ -4490,12 +4691,12 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1105
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1205
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4504,20 +4705,30 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Inviter _Kontakter"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:72
-#: ../src/gajim.py:982
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observerere"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:72 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1349 ../src/gajim.py:808 ../src/roster_window.py:815
-#: ../src/roster_window.py:1466 ../src/roster_window.py:1533
-#: ../src/roster_window.py:1535 ../src/roster_window.py:1672
+#: ../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"
 
@@ -4526,11 +4737,11 @@ msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python bindinger mangler på denne maskinen"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus egenskapene til Gajim kan ikke brukes"
 
@@ -4561,1043 +4772,1053 @@ msgstr ""
 "Sesjons bussen er ikke tilgjengelig.\n"
 "Prøv å les http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "tolv"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "en"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "to"
 
-#: ../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 "fire"
 
-#: ../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 "seks"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "syv"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "åtte"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "ni"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "ti"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "elleve"
 
+#. 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"
+msgid "%(0)s o'clock"
+msgstr "klokken %(0)s"
 
-#. 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 "klokken $0"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem over $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "fem over %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "ti over $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "ti over %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart over $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "kvart over %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "ti på halv $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "ti på halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fem på halv $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "fem på 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 over halv $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "fem over halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "ti over halv $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "ti over halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvart på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "kvart på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "ti på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "ti på %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fem på $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "fem på %(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 "Tidlig morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morgen"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Nesten formiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Middag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Ettermiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Ettermiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Sen kveld"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Starten av uken"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Midten av uken"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Slutten av uken"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:157
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:215
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:218
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:222
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:225
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:229
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:232
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:235
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:283 ../src/features_window.py:119
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:306
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:311
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:313
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:317
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:339
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:341
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:349
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:357
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:359
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:400
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:402
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:404
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "skriver en melding..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:407
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:409
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
-#: ../src/common/helpers.py:983 ../src/common/helpers.py:990
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d melding venter"
 msgstr[1] "%d meldinger venter"
 
-#: ../src/common/helpers.py:996
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:999 ../src/common/helpers.py:1018
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1001
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1015
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d hendelse venter"
 msgstr[1] "%d hendelser venter"
 
-#: ../src/common/helpers.py:1048
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s er ikke et gyldig 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 "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim konto %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "for konto %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Redd"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Forbløffet"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Amorøs"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Sint"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Irritert"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Engstelig"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Opphisset"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Skamfull"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Kjeder seg"
 
-#: ../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 "Rolig"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Forsiktig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Kald"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Selvsikker"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Forvirret"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Overveiende"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Utfordrende"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Gretten"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Gal"
 
-#: ../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 "Nysgjerrig"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Nedslått"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Deprimert"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Skuffet"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Vemmes"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Forferdet"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Distrahert"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Forlegen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Misunnelig"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Begeistret"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Flørtende"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustrert"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Sørgende"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Gretten"
 
-#: ../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 "Håpefull"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Varm"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Ydmyk"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Ydmyket"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Sulten"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Såret"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Imponert"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "I Respekt"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Forelsket"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Indignert"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Interessert"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Beruset"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Uovervinnelig"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Sjalu"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Ensom"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Bortkommet"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Heldig"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Slem"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Humørsyk"
 
-#: ../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 "Nøytral"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Fornærmet"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Opprørt"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Leken"
 
-#: ../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 "Avslappet"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Lettet"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Angrende"
 
-#: ../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 "Lei seg"
 
-#: ../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 "Tilfreds"
 
-#: ../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 "Sjokkert"
 
-#: ../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 "Syk"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Søvnig"
 
-#: ../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 "Stresset"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Sterk"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Overrasket"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Takknemlig"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Tørst"
 
-#: ../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 "Udefinert"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Svak"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Bekymret"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Gjør Oppgaver"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Kjøper Grønnsaker"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Vasker"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Koker"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Gjør Vedlikehold"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Tar Oppvasken"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Vasker Skittentøy"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Gjør Hagearbeid"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Løper et Ærend"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Går tur med Hunden"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Drikker"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Tar seg en Øl"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Tar seg en Kaffe"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Tar seg en Kopp Te"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Tar seg en Matbit"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Spiser Frokost"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Spiser Middag"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Spiser Lunch"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Trener"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Sykler"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Danser"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "På tursti"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Jogger"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Spiller Sport"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Løper"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Går på Ski"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Svømmer"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Trener"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Steller seg"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "Er på Spa"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Pusser Tenner"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Får seg en Hårklipp"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Barberer seg"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Tar et Bad"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Tar seg en Dusj"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Har en Avtale"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Fridag"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Slapper av"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Gjemmer seg"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "På Ferie"
 
-#: ../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 "Planlagt Ferie"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Tenker"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Slapper Av"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Fisker"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Spiller"
 
-#: ../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 "Fester"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Leser"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Øver"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Sover"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Røyker"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Sosialiserer"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Soler seg"
 
-#: ../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 på en Film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Snakker"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "I det Virkelige Liv"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Sitter i Telefonen"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "På Video Telefon"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Reiser"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Pendler"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Kjører"
 
-#: ../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å et Fly"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "På et Tog"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "På en Reise"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Spaserer"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Koder"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "I et Møte"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Studerer"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Skriver"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Klarer ikke å lytte til port %s."
 
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5606,7 +5827,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:279
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5623,15 +5844,15 @@ msgstr ""
 "Verten %s du konfigurerte har ft_add_hosts_to_send i avanserte valg og er "
 "ikke gyldig, så den ignoreres."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "For å sende og motta meldinger må du koble til på nytt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi feil"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5640,31 +5861,31 @@ msgstr ""
 "%s\n"
 "Link-lokal meldinger fungerer muligens ikke riktig."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Vennligst sjekk om Avahi eller Bonjour er installert."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Kunne ikke starte lokal tjeneste"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Klarer ikke å lytte til port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Vennligst sjekk om avahi-tjenesten kjører."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunne ikke endre status til konto \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5673,66 +5894,50 @@ msgstr ""
 "sendes."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Din melding kunne ikke bli sendt."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten er frakoblet. Din melding kunne bli sendt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Tilkobling til maskinen kunne ikke opprettes: Tidsutløp under sending av "
 "data."
 
-#: ../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 "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:150 ../src/config.py:579
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: ../src/config.py:318
-msgid "Active"
-msgstr "Aktiv"
-
-#: ../src/config.py:326
-msgid "Event"
-msgstr "Hendelse"
-
-#: ../src/config.py:402
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:409
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:451
-msgid "Always use OS/X default applications"
-msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#: ../src/config.py:452
-msgid "Custom"
-msgstr "Egendefinert"
-
-#: ../src/config.py:645 ../src/dialogs.py:1199
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:646
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5741,106 +5946,70 @@ msgstr ""
 "Du må installere %s ordbok for å bruke stavekontroll, eller velge et annet "
 "språk ved å sette stavekontro_llspråk valget."
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1011
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:1047
-msgid "First Message Received"
-msgstr "Første Melding Motatt"
-
-#: ../src/config.py:1048
-msgid "Next Message Received Focused"
-msgstr "Neste Melding Motatt i Fokus"
-
-#: ../src/config.py:1050
-msgid "Next Message Received Unfocused"
-msgstr "Neste Melding Motatt ikke i Fokus"
-
-#: ../src/config.py:1051
-msgid "Contact Connected"
-msgstr "Kontakt Koblet til"
-
-#: ../src/config.py:1052
-msgid "Contact Disconnected"
-msgstr "Kontakt Frakoblet"
-
-#: ../src/config.py:1053
-msgid "Message Sent"
-msgstr "Melding Sendt"
-
-#: ../src/config.py:1054
-msgid "Group Chat Message Highlight"
-msgstr "Gruppe Samtale Melding Utheving"
-
-#: ../src/config.py:1055
-msgid "Group Chat Message Received"
-msgstr "Gruppe Samtale Melding Motatt"
-
-#: ../src/config.py:1056
-msgid "GMail Email Received"
-msgstr "Gmail E-post Motatt"
-
 #. Name column
-#: ../src/config.py:1313 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:770 ../src/disco.py:1562 ../src/disco.py:1808
-#: ../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 "Navn"
 
-#: ../src/config.py:1399
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1400
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Dersom du ønsker at endringene skal tre i kraft umiddelbart, må du logge inn "
 "på nytt."
 
-#: ../src/config.py:1525 ../src/config.py:1624
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1660 ../src/config.py:1703
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1661
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1687
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1688
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle samtaler og gruppesamtaler vil bli lukket. Ønsker du å fortsette?"
 
-#: ../src/config.py:1699
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1700
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1704
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "For å endre konto navnet må du lese alle ventende hendelser."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5848,144 +6017,139 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1715 ../src/config.py:1719
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1720
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1794
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1795
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1813 ../src/config.py:1821 ../src/config.py:1864
-#: ../src/config.py:3079 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Ugyldig Jabber ID"
-
-#: ../src/config.py:1822
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2012 ../src/config.py:3151
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2013 ../src/config.py:3152
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2034
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2035
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det oppsto et problem ved henting av dine OpenPGP nøkler."
 
-#: ../src/config.py:2070
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2071
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2078
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2079
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Du må lage en konto før du kan redigere din personlige informasjon."
 
-#: ../src/config.py:2086 ../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 er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan ikke endre din personlige informasjon uten å være tilkoblet."
 
-#: ../src/config.py:2091
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2092
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2123
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2124
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Vennligst omdøp eller fjern den før du slår på link-lokal meldinger."
 
-#: ../src/config.py:2307
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2309
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2345
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2346
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2347
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2348
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2397 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2414
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2439
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2441
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5993,11 +6157,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2443
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2444
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6005,11 +6169,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2446
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2447
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6017,11 +6181,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2450
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6029,14 +6193,15 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2451
+#: ../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 ""
 "Can være en av følgende:\n"
 "1. bruker@domene/ressurs (bare denne ressursen treffer).\n"
@@ -6045,83 +6210,88 @@ msgstr ""
 "4. domene (domene selv treffer, smt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser i et underdomene."
 
-#: ../src/config.py:2548
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2570 ../src/gajim.py:1431 ../src/roster_window.py:1932
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2571 ../src/roster_window.py:1906
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2572 ../src/roster_window.py:1933
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2581
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2582
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2678
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2678
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2679
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2680
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2748
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:2781
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2782
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Vennligst fyll inn server og rom feltene for å fjerne dette bokmerket."
 
-#: ../src/config.py:3062
-msgid "Invalid username"
-msgstr "Ugyldig brukernavn"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3064
-msgid "You must provide a username to configure this account."
-msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Kallenavn ikke lovlig: %s"
 
-#: ../src/config.py:3090
-msgid "Duplicate Jabber ID"
-msgstr "Duplikat Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Ugyldig server"
 
-#: ../src/config.py:3091
-msgid "This account is already configured in Gajim."
-msgstr "Kontakten er allerede konfigurert i Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:3108
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3109 ../src/config.py:3298
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6131,25 +6301,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3127
-msgid "Invalid server"
-msgstr "Ugyldig server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3128
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3179 ../src/gajim.py:2009
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3180 ../src/gajim.py:2010
+#: ../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 ""
 "Dette sertifikatet er allerede i filen %s, så det legges ikke til igjen."
 
-#: ../src/config.py:3248
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6164,7 +6342,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3254 ../src/gajim.py:2033
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6175,23 +6353,63 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3277 ../src/config.py:3316
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3297
-msgid "Your new account has been created successfully"
-msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
-
-#: ../src/config.py:3400
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktiv"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Hendelse"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Første Melding Motatt"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Neste Melding Motatt i Fokus"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Neste Melding Motatt ikke i Fokus"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontakt Koblet til"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontakt Frakoblet"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Melding Sendt"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Gruppe Samtale Melding Utheving"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Gruppe Samtale Melding Motatt"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Gmail E-post Motatt"
+
+#: ../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"
@@ -6201,7 +6419,7 @@ msgstr ""
 "har blitt motatt av andre enden. Dersom dette ikonet\n"
 "vises lenge er det sannsynlig at meldingen ble mistet."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6209,74 +6427,74 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt\n"
 "siden sist du fulgte med i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:691
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Avslutt"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:703
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:708
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:738
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:741
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
-#: ../src/conversation_textview.py:1014 ../src/conversation_textview.py:1032
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1289
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1293
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1327
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber ID allerede i listen"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Jabber IDen du skrev inn er allerede i lsiten. Vennligst velg en ny. "
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6291,145 +6509,145 @@ msgstr "Kontakt navn: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:460
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Sett Stemning"
 
-#: ../src/dialogs.py:548
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:550
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Status Melding"
 
-#: ../src/dialogs.py:662
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Overskriv Status Melding?"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Dette navnet er allerede i bruk. Ønsker du å overskrive denne status "
 "meldingen?"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Lagre som Forvalgt Status Melding"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Vennligst skriv inn et navn for denne status meldingen"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM Adresse:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Nummer:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Nummer:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN Adresse:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo Adresse:"
 
-#: ../src/dialogs.py:719
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:721
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:878 ../src/dialogs.py:884 ../src/dialogs.py:889
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:890
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:904
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:941
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:999
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1019
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1025
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Sist men ikke minst ønsker vi å takke alle de som lager installasjonspakker."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1038
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1200
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6442,88 +6660,88 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Kallenavnet inneholder ulovlige tegn"
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings forespørsel for konto %(account)s fra %(jid)s"
 
-#: ../src/dialogs.py:1607
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2634
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan ikke gå inn i en gruppe samtale uten å være tilkoblet."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1451
-#: ../src/groupchat_control.py:1732
-msgid "The nickname has not allowed characters."
-msgstr "Kallenavnet inneholder ulovlige tegn"
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1899
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1900
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../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 "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan ikke synkronisere med en konto uten å være tilkoblet."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../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:"
@@ -6532,276 +6750,301 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2344 ../src/dialogs.py:2487
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../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 "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:474
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:476
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:478
-#: ../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 "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:478
-#: ../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 "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:479
-#: ../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 "Ny Privat Melding"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1596 ../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:1662 ../src/notify.py:481
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1562 ../src/gajim.py:1629
-#: ../src/notify.py:483 ../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 "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1704 ../src/gajim.py:1726
-#: ../src/gajim.py:1743 ../src/notify.py:485 ../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 Overføring Komplett"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1707 ../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 Overføring Stoppet"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1452 ../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 "Gruppesamtale invitasjon"
 
-#: ../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 "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2263 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2265 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2267 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2270 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2293 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2316 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Skjema %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2388 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2389 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2433
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2435
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:2559
+#. 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 "Jeg vil legge deg til min kontaktliste."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Adresse"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Humørsyk"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Gruppe"
+
+#. 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 "Jeg vil legge deg til min kontaktliste."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2563
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:2619
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Rekkefølge:  %(order)s, handling: %(action)s, type: %(type)s, verdi: %(value)"
 "s"
 
-#: ../src/dialogs.py:2624
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:2666
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:2753
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:2849
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:2851
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:2921
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Du må skrive et navn for å lage en liste over uønskede."
 
-#: ../src/dialogs.py:2954
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har invitert deg til gruppesamtalen %(room_jid)s"
 
-#: ../src/dialogs.py:2967
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2969
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3024
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3034 ../src/dialogs.py:3085
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3039
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3072
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3155
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3157
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
 #. # means number
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:3351
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:3823
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6812,19 +7055,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3827
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:3833 ../src/dialogs.py:3920
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:3841
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:3846
+#: ../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 "
@@ -6834,19 +7077,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:3849 ../src/dialogs.py:3901 ../src/dialogs.py:3914
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6861,23 +7104,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:3902
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Kontaktens nøkkel (%s) <b>passer ikke</b> med nøkkelen tildelt i Gajim."
 
-#: ../src/dialogs.py:3908
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:3915
+#: ../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."
@@ -6886,7 +7129,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:3921
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -6894,33 +7137,33 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6928,219 +7171,241 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1180
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1190 ../src/disco.py:1354
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1391
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1817
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Bokmerke allerede satt"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bokmerke har blitt lagt til"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:1825
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:1882
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1888
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:1894
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
-#: ../src/features_window.py:49
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "SSL sertifikats feil"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Et bibliotek som brukes til å verifisere server sertifikater for å sikre en "
 "sikker tilkobling."
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Krever python-pyopenssl."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "Serverløs samtale med automatisk oppdagede klienter på et lokalt nettverk."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Krever pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:57
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Kommandoer: %s"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Et script for å kontrollere Gajim via kommandolinjen."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Krever python-dbus."
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88
+#: ../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 "Funksjon ikke tilgjengelig i Windows."
 
-#: ../src/features_window.py:61
-msgid "OpenGPG"
-msgstr "OpenPGP"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP Kryptering"
 
-#: ../src/features_window.py:62
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Kryptering av samtalemeldinger med GPG nøkler."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Krever gpg og python-GnuPGInterface."
 
-#: ../src/features_window.py:65
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Autodeteksjon av nettverksstatus."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Krever gnome-network-manager og python-dbus."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Sesjons Behandling"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesjon er lagret på utlogging og gjenopprettes ved pålogging."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:73
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Passord for å komme inn i rommet"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Passord kan lagres sikkert og ikke bare i klartekst."
 
-#: ../src/features_window.py:75
-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 "Krever gnome-keyring og python-gnome2-desktop."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Evne til å koble til servere som bruker SRV records."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Krever dnsutils."
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Krever nslookup for å bruke SRV records."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Stavekontroll"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Stavekontroll av komponerte meldinger."
 
-#: ../src/features_window.py:83
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Krever python-gnome2-extras eller kompilering av gtkspell modul fra Gajims "
-"kildekode."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Krever python-sexy."
 
-#: ../src/features_window.py:85
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Kunngjøringer"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Passiv påminnelse for nye hendelser."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7148,51 +7413,52 @@ msgstr ""
 "Krever python-notify eller alternativt python-dbus i samarbeid med "
 "notification-daemon."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Trayicon"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Et ikon i systemtray som viser gjeldende tilkoblingsstatus."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Krever python-gnome2-extras eller kompilert trayicon modul fra Gajims "
 "kildekode."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Krever PyGTK >= 2.10."
 
-#: ../src/features_window.py:93
-msgid "Idle"
-msgstr "Ubrukt"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Justér etter status"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "Evnen til å måle inaktiv tid for å kunne sette auto status."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Krever python-gnome2."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformer LaTeX uttrykk mellom $$ $$."
 
-#: ../src/features_window.py:99
+#: ../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."
@@ -7200,7 +7466,7 @@ msgstr ""
 "Krever texlive-latex-base og dvipng. Du må sette 'use_latex' til True i "
 "Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:100
+#: ../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."
@@ -7208,23 +7474,25 @@ msgstr ""
 "Krever texlive-latex-base og dvipng (Alt er i MikTeX). Du må sette "
 "'use_latex' til True i Avansert Konfigurasjons Editoren."
 
-#: ../src/features_window.py:101
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Ende til Ende Kryptering"
 
-#: ../src/features_window.py:102
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Kryptering av samtalemeldinger."
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Krever python-crypto."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST Generator"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7232,24 +7500,24 @@ msgstr ""
 "Generer XHTML ut fra RST kode (see http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:109
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu faner."
 
-#: ../src/features_window.py:111 ../src/features_window.py:112
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Krever python-sexy."
 
-#: ../src/features_window.py:126
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Funksjonalitet"
 
@@ -7278,7 +7546,7 @@ msgstr "Størrelse: %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:496
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Du"
 
@@ -7288,7 +7556,7 @@ msgid "Sender: %s"
 msgstr "Sender: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -7320,26 +7588,27 @@ msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Fil Overføring Stoppet"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Beskrivelse:"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
@@ -7359,12 +7628,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../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 ikke overskrive eksisterende fil \"%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."
@@ -7372,22 +7641,22 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive 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 "Denne filen finnes fra før"
 
-#: ../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 "Hva ønsker du å gjøre?"
 
 #. 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\" er ikke 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 ikke rettigheter til å lage filer i denne katalogen."
 
@@ -7423,11 +7692,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Avsender: "
 
@@ -7435,36 +7704,40 @@ msgstr "Avsender: "
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:92
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s er ikke et gyldig loggnivå"
-
-#: ../src/gajim.py:164
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../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 trenger PyGTK 2.8 eller høyere"
 
-#: ../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 tenger PyGTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../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 trenger GTK 2.8 eller høyere"
 
-#: ../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 trenger GTK 2.8 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:202
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7473,20 +7746,20 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
 
-#: ../src/gajim.py:211
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim trenger PySQLite2 for å kjøre"
 
-#: ../src/gajim.py:219
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../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 "
@@ -7496,11 +7769,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:373
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:374
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7508,25 +7781,35 @@ msgstr ""
 "En annen instans av Gajim ser ut til å kjøre\n"
 "Start likevel?"
 
-#: ../src/gajim.py:499
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gajim.py:500
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Ingen GPG nøkkel tildelt"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:515
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gajim.py:516
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7537,50 +7820,59 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gajim.py:577
+#: ../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 "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:579
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gajim.py:582
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:630 ../src/notify.py:493 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gajim.py:936 ../src/gajim.py:940
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Feil %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:950 ../src/gajim.py:964
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:996
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Abonnerings Forespørsel"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:997
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har godkjent at du kan se hans eller hennes status."
 
-#: ../src/gajim.py:1016
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gajim.py:1017
+#: ../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?"
@@ -7588,72 +7880,77 @@ msgstr ""
 "Du vil alltid se han eller henne som frakoblet.\n"
 "Ønsker du å fjerne han eller henne fra din kontakt liste?"
 
-#: ../src/gajim.py:1058
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Fjern Abonnement"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:1234 ../src/groupchat_control.py:1162
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s er nå kjent som %(new_nick)s"
 
-#: ../src/gajim.py:1252 ../src/groupchat_control.py:1337
-#: ../src/history_window.py:426 ../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 er nå %(status)s"
 
-#: ../src/gajim.py:1315
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har satt tittel til %(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:1379 ../src/groupchat_control.py:1122
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gajim.py:1384
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "En non-privacy-related rom konfigurasjons ending har skjedd"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gajim.py:1394
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gajim.py:1397
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gajim.py:1400
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Et passord kreves for å bli med i rommet %s. Vennligst skriv det."
 
-#: ../src/gajim.py:1466
+#: ../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"
@@ -7661,27 +7958,56 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: ../src/gajim.py:1468
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:1471
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG fungerer ikke"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
+"meldinger."
+
+#: ../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 "_Ikke spør meg igjen"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
+"variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
+
+#: ../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:1575
+#: ../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-post samtale"
 msgstr[1] "Du har %d nye e-post samtaler"
 
-#: ../src/gajim.py:1588
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7696,34 +8022,44 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1659
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gajim.py:1727
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Fjerner kontakt fra kontaktlisten"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Feil under lesing av fil:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1731
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/gajim.py:1744
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1748
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fil overføring av %(filename)s til %(name)s er stoppet."
 
-#: ../src/gajim.py:1836
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7732,36 +8068,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gajim.py:1843
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gajim.py:1915
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Vennligst skriv inn et nytt brukernavn for din lokale konto"
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1940
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1951
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gajim.py:1976
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gajim.py:1977
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7769,11 +8105,11 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: ../src/gajim.py:2030
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7784,19 +8120,19 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gajim.py:2036
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gajim.py:2051
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gajim.py:2052
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7809,11 +8145,11 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket?"
 
-#: ../src/gajim.py:2074 ../src/gajim.py:2104
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gajim.py:2075
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7821,16 +8157,11 @@ msgstr ""
 "Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
 "at du ønsker å gjøre det?"
 
-#: ../src/gajim.py:2077 ../src/gajim.py:2107
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gajim.py:2078 ../src/gajim.py:2108 ../src/groupchat_control.py:1841
-#: ../src/roster_window.py:3769
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
-
-#: ../src/gajim.py:2105
+#: ../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?"
@@ -7839,21 +8170,21 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gajim.py:2122
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2591 ../src/gajim.py:2613
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gajim.py:2592
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -7861,7 +8192,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gajim.py:2614
+#: ../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 "
@@ -7871,55 +8202,38 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gajim.py:2640 ../src/roster_window.py:3303
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2919
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gajim.py:3016
-msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
-
-#: ../src/gajim.py:3017
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
-
-#: ../src/gajim.py:3030
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
-
-#: ../src/gajim.py:3031
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Vis hjelp for en spesifisert kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "vis hjelp for kommando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Vis eller skjul kontaktliste vinduet"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Spretter opp et nytt vindu med den neste ventende hendelsen"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7927,49 +8241,50 @@ msgstr ""
 "Skriv ut en liste over alle kontakter i kontaklisten. Hver kontakt kommer på "
 "en egen linje"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "vis bare kontakter for denne kontoen"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Skriv ut en liste over registrerte kontoer"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Endrer status på konto eller kontoer"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "melding"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "status melding"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -7977,19 +8292,23 @@ msgstr ""
 "endre status til konto \"konto\". Dersom uspesifisert, prøv å endre status "
 "til alle kontoer som har \"synkroniser med global status\" valget påslått"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Vis samtale vinduet så du kan sende meldinger til en kontakt"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID til kontakten du ønsker å snakke med"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../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 spesifisert vil kontakten fjernes fra listen på denne kontoen"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7999,30 +8318,30 @@ msgstr ""
 "nøkkelen og konto er valgfri. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID til kontakten som vil motta meldingen"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "meldings innhold"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp nøkkel"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "dersom spesifisert, vil meldingen bli sendt med denne kontoen"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8032,137 +8351,137 @@ msgstr ""
 "nøkkelen og konto er valgfritt. Dersom du ønsker å sette bare 'konto', uten "
 "'OpenPGP nøkkel', sett bare 'OpenPGP nøkkel' til ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tittel"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "meldings tittel"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Sender nye meldinger to en gruppesamtale som du er tilkoblet."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID til rommet som vil motta meldingen"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Henter detaljert informasjon om en kontakt"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID til kontakten"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Henter detaljert informasjon om en konto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Navn på kontoen"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "fil"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Fil sti"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Viser alle innstillingsmuligheter og gjeldende verdier"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Setter verdien av 'nøkkel' til 'verdi',"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "nøkkel=verdi"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'nøkkel' er navnet på innstillingen, 'verdi' er gjeldende innstilling"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Sletter en innstilling"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "nøkkel"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "navnet på innstillingen som skal slettes"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Skriver gjeldende Gajim innstillinger til .config filen"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Legger til kontakt til kontaktlisten"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Legger til en ny kontakt til denne kontoen."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Returnerer innstillinger (globale innstillinger om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Returnerer gjeldende status melding (den globale om ikke en konto er "
 "spesifisert)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Returnerer antall uleste meldinger"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Åpner 'Start Samtale' dialogen"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Starter samtale, med denne kontoen"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Send egendefinert XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML for sending"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8170,67 +8489,72 @@ msgstr ""
 "Kontoen som xmlen vil bli sendt; dersom ikke spesifisert vil xmlen bli sendt "
 "til alle kontoer"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Konto som du ønsker å benytte for å håndtere det"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "meldings innhold"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Konto som du ønsker å bruke for å gå inn i rommet"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8239,15 +8563,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:403
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8256,16 +8580,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:407
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:411
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:415
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8274,7 +8598,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:480
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8283,7 +8607,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:485
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8292,7 +8616,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:504
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8309,175 +8633,178 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Vennligst lag et nytt rent tema med ditt ønskede navn."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Du kan ikke slette ditt gjeldene tema"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:149
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:151
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du er ikke lenger i samtalerommet \"%(room)s\" eller \"%(nick)s\" har dratt."
 
-#: ../src/groupchat_control.py:450
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:602
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:604
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
-#: ../src/groupchat_control.py:1025
-msgid "Really send file?"
-msgstr "Virkelig send fil?"
-
-#: ../src/groupchat_control.py:1026
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Dersom du sender en fil til %s, vil han/henne kjenne din ekte Jabber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1125
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1130
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Serveren har satt eller endret ditt rom kallenavn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1136
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt utvist av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1151
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blitt uønsket av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1198 ../src/groupchat_control.py:1202
-#: ../src/groupchat_control.py:1207
+#: ../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 blitt fjernet fra rommet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1204
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1278
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Tilknytning for %(nick)s har blitt satt til %(affiliation)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Tilknutning for %(nick)s har blitt satt til %(affiliation)s"
 
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen til %(nick)s har blitt satt til %(role)s"
 
-#: ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1450 ../src/groupchat_control.py:1731
-msgid "Invalid nickname"
-msgstr "Ugyldig kallenavn"
-
-#: ../src/groupchat_control.py:1474 ../src/groupchat_control.py:1492
-#: ../src/groupchat_control.py:1576 ../src/groupchat_control.py:1593
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_control.py:1508
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Dette gruppesamtalerommet har ikke tittel"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 
-#: ../src/groupchat_control.py:1654
+#: ../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 "Kallenavn ikke funnet: %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 ""
 "Bruksanvisning: /%s <kallenavn|JID> [grunn], utviser JIDen fra "
 "samtalerommet. Kallenavnet til en bruker kan bli brukt, men ikke dersom det "
 "inneholder \"@\". Skulle en bruker med den JIDen være tilstede i rommet vil "
 "denne også bli kastet ut. Det støttes ikke med mellomrom i kallenavnet."
 
-#: ../src/groupchat_control.py:1661
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8486,7 +8813,7 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu med den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8495,7 +8822,7 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8504,7 +8831,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [grunn], inviterer JID til gjeldende rom, og viser "
 "en grunn dersom spesifisert."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8513,18 +8840,17 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_control.py:1681
-#, 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 ""
 "Bruksanvisning: /%s <kallenavn> [grunn], fjerner brukeren spesifisert av "
 "kallenavn fra rommet og viser om spesifisert en grunn. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_control.py:1690
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8533,25 +8859,25 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
 "sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
 "samtalerom."
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Bruksanvisning: /%s , viser navnene til deltakere i samtalerommet."
 
-#: ../src/groupchat_control.py:1703
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Bruksanvisning: /%s [tittel], viser eller oppdaterer samtalerom tittel."
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8559,40 +8885,56 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_control.py:1835
+#: ../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 ""
+"Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende "
+"samtalerom."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Er du sikker på at du vil gå ut av samtalerommet \"%s\"?"
 
-#: ../src/groupchat_control.py:1837
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Dersom du lukker dette vinduet, så vil du bli koblet fra dette samtalerommet."
 
-#: ../src/groupchat_control.py:1874
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1875
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1879
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1880
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1906
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1907
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8600,22 +8942,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2080
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:2081 ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2372
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8646,80 +8988,80 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Feil under traversering 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 "Kunne ikke skrive til %s. Sesjons Håndterings støtte vil ikke virke."
 
 #. 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 er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../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 "Alltid sjekk om Gajim er standard Jabber klient ved oppstart"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../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 "Bilde kan ikke lagres i %(type)s format. Lagre som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Ønsker du å rengjøre databasen? (STERKT FRARÅDET MENS GAJIM KJØRER)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8733,76 +9075,86 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:434
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:509
+#: ../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:546
+#: ../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] "Ønsker du virkelig å slette loggene til den valgte kontakten?"
 msgstr[1] "Ønsker du virkelig å slette loggene fra de valgte kontaktene?"
 
-#: ../src/history_manager.py:550 ../src/history_manager.py:585
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:582
+#: ../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] "Ønsker du virkelig å slette den valgte meldingen?"
 msgstr[1] "Ønsker du virkelig å slette de valgte meldingene?"
 
-#: ../src/history_window.py:296
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Samtale Historikk med %s"
 
-#: ../src/history_window.py:341
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr "Disk Feil"
 
-#: ../src/history_window.py:422
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s er nå %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:432
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "Status er nå: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:435
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:442
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Du er ikke tilkoblet til serveren"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Ønsker du virkelig å slette den valgte meldingen?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:444
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:452
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -8814,66 +9166,67 @@ msgstr "- meldinger vil bli logget"
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Ny Privat Melding fra gruppesamtalerom %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 "Melding fra %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Generisk"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignorer"
 
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2768
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2771
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2773 ../src/roster_window.py:2784
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
@@ -8905,56 +9258,48 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:286 ../src/roster_window.py:940
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1850
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1851
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1884
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1885
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1909
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring er installert men ikke \t\t\t\t\t\t\tstartet riktig (system "
-"variabel sikkert ikke \t\t\t\t\t\t\tsatt riktig)"
-
-#: ../src/roster_window.py:1919 ../src/roster_window.py:1939
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:2103 ../src/roster_window.py:3247
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2104 ../src/roster_window.py:3248
+#: ../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?"
@@ -8962,15 +9307,28 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:2130
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2268 ../src/roster_window.py:2505
+#: ../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 "Er du sikker på at du vil gå ut av rommene \"%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 uleste meldinger"
 
-#: ../src/roster_window.py:2269
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8978,16 +9336,16 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått og kontakten er i kontaktlisten."
 
-#: ../src/roster_window.py:2506
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2509
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2510
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8995,11 +9353,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2513
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2518
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9009,51 +9367,56 @@ msgstr ""
 "transportene: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2649
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2650
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2657
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2658
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2715
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Ønsker du å fjerne gruppen %s fra kontaktlisten?"
 
-#: ../src/roster_window.py:2716
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Også fjerne alle kontakter i denne gruppen fra kontaktlisten"
 
-#: ../src/roster_window.py:2755
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3108
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9062,11 +9425,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3117
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3121
+#: ../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."
@@ -9074,16 +9437,16 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9093,19 +9456,19 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3171
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3172
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du må lage en konto før du kan snakke med andre kontakter."
 
-#: ../src/roster_window.py:3687
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3689
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9113,13 +9476,13 @@ msgstr ""
 "Din server støtter ikke lagring av metakontakt informasjon, så denne "
 "informasjonen vil ikke bli lagret til neste tilkobling."
 
-#: ../src/roster_window.py:3763
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du skal til å lage en metakontakt. Er du sikker på at du ønsker å fortsette?"
 
-#: ../src/roster_window.py:3765
+#: ../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 "
@@ -9129,139 +9492,141 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:3878
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:3889
+#: ../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] "Ønsker du å sende denne filen til %s:"
 msgstr[1] "Ønsker du å sende disse filene til %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Send %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Gjør %s og %s metakontakter"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4566 ../src/roster_window.py:4637
-#: ../src/roster_window.py:4646 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4653
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4658
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4695 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4755
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:4817 ../src/roster_window.py:4926
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:4844
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:4851
-msgid "Mood"
-msgstr "Stemning"
-
-#: ../src/roster_window.py:4855
-msgid "Activity"
-msgstr "Aktivitet"
-
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5014
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
 #. Send Group Message
-#: ../src/roster_window.py:5022 ../src/roster_window.py:5548
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5030
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5568
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Send single message
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5685
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5693
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
-#: ../src/roster_window.py:5767
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5774
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
-#: ../src/roster_window.py:5854
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
 #. History manager
-#: ../src/roster_window.py:5967
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5976
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:6186
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -9278,20 +9643,20 @@ msgstr "Feil i motatt dataskjema"
 msgid "No result"
 msgstr "Ingen resultater"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Disk SkriveFeil"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Tittel: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9306,7 +9671,7 @@ msgstr ""
 "\n"
 "\tEr disse valgene akseptable?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9321,124 +9686,116 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../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 "Ressurs: "
 
-#: ../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 denne samtalegruppen"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../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 "Siste status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../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 "Sang:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../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"
@@ -9454,16 +9811,21 @@ msgstr "?Client:Ukjent"
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Client:Ukjent"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9471,7 +9833,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9479,13 +9841,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9493,24 +9855,108 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abonnerings forespørsel"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
+
+#~ msgid "Servers Features"
+#~ msgstr "Server Funksjonalitet"
+
+#~ msgid "Your JID:"
+#~ msgstr "Din JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Navn:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Maskin:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Vis _kontaktliste"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Velg hvilken konto du skal synkronisere med"
+
+#~ msgid "Modify Account"
+#~ msgstr "Rediger Konto"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s etter %(artist)s\n"
+#~ "fra %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim konto %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#~ msgid "Custom"
+#~ msgstr "Egendefinert"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Duplikat Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Kontakten er allerede konfigurert i Gajim."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Krever python-gnome2-extras eller kompilering av gtkspell modul fra "
+#~ "Gajims kildekode."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "Ubrukt"
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Fil overføringen ble stoppet av kontakten på den andre siden"
+
+#~ msgid "Generic"
+#~ msgstr "Generisk"
+
+#~ msgid "Mood"
+#~ msgstr "Stemning"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivitet"
+
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Krever kompilering av ide modulen fra Gajims kildekode."
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP Kryptering"
-
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr "%s har ikke publisert en OpenPGP nøkkel og du har ikke tilegnet en"
 
@@ -9535,9 +9981,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Retype Password:"
 #~ msgstr "_Repeter Passord:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Bruk proxy"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9734,9 +10177,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Pop it up"
 #~ msgstr "_Sprett opp"
 
-#~ msgid "_URL:"
-#~ msgstr "_URL:"
-
 #~ msgid "Address"
 #~ msgstr "Adresse"
 
@@ -9869,9 +10309,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Slipp %s i samtalerom %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Gjør %s og %s metakontakter"
-
 #~ msgid "Affiliation:"
 #~ msgstr "Tilhørighet: "
 
@@ -9950,9 +10387,6 @@ msgstr " ressurs med prioritet"
 #~ "Lyd som spilles når en ny MUC melding kommer. (Denne instillingen er kun "
 #~ "aktiv når notify_on_all_muc_messages er True)"
 
-#~ msgid "Add"
-#~ msgstr "Adresse"
-
 #~ msgid "Away "
 #~ msgstr "Borte"
 
@@ -9974,9 +10408,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Invalid room or server name"
 #~ msgstr "Ugyldig rom eller servernavn"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "vCard publisering vellykket"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Din personlige informasjon har blitt publisert uten feil."
 
@@ -10036,9 +10467,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s har sendt deg en ny melding."
 
-#~ msgid "GUI Migration failed"
-#~ msgstr "vCard publisering feilet"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "Loggene ble migrert til databasen uten feil."
 
@@ -10096,9 +10524,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "account: "
 #~ msgstr "konto:"
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
 #~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
diff --git a/po/pl.po b/po/pl.po
index 0761fcbf2..456949c75 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-19 15:25+0200\n"
-"PO-Revision-Date: 2009-05-15 14:38+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-19 23:59+0200\n"
 "Last-Translator: Sławomir Domagała <godlark@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -106,52 +106,57 @@ msgstr ""
 "Odcisk klucza SHA1 tego certyfikatu:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Używaj aut_oryzacji serwera proxy"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "_Mam już konto i chcę z niego korzystać"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Chcę za_rejestrować nowe konto Jabbera"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../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 "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Zarządzaj..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Zapisz _hasło"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Ustaw profil po połączeniu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../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,36 +164,36 @@ msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z siecią Jabber."
 
-#: ../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 "_Zaawansowane"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Nazwa hosta: "
 
-#: ../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:57
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../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 "_Hasło:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Serwer:"
 
@@ -223,17 +228,17 @@ msgid "Administration operations"
 msgstr "Operacje administracyjne"
 
 #: ../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 "Automatyczne połącz po zerwaniu połączenia"
 
 #: ../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 "P_ołącz przy starcie programu"
 
 #: ../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 "Z_mień hasło"
 
@@ -249,23 +254,23 @@ msgstr ""
 "tylko serwer daje taką możliwość. Ta opcja wyłącza TLS"
 
 #: ../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 "Wybierz _klucz..."
 
 #: ../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 "Kliknij, aby zmienić hasło dla konta"
 
 #: ../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 ""
 "Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
 
 #: ../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 "Połączenie"
 
@@ -275,10 +280,10 @@ msgstr "Zmień informacje o sobie..."
 
 #. 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:1233
-#: ../src/common/helpers.py:1245 ../src/notify.py:561 ../src/notify.py:582
-#: ../src/notify.py:621 ../src/notify.py:633
+#: ../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"
 
@@ -286,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:2684
-#: ../src/roster_window.py:5227
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Ogólne"
 
@@ -298,7 +303,7 @@ msgid "Hostname: "
 msgstr "Nazwa hosta: "
 
 #: ../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."
@@ -307,7 +312,7 @@ msgstr ""
 "Twoim, tak aby przesyłanie plików przebiegało sprawniej."
 
 #: ../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"
@@ -324,7 +329,7 @@ msgstr ""
 "z prawem do odczytu tylko dla ciebie"
 
 #: ../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"
@@ -333,7 +338,7 @@ msgstr ""
 "wykorzystaniem tego konta"
 
 #: ../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 "
@@ -343,13 +348,13 @@ msgstr ""
 "menu na dole okna listy kontaktów) wpłynie odpowiednio na status tego konta"
 
 #: ../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 "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1577
-#: ../src/config.py:2082
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
@@ -359,19 +364,19 @@ msgstr "Nie wybrano żadnego klucza"
 #. 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:1125
-#: ../src/config.py:1214 ../src/config.py:1482 ../src/config.py:1487
-#: ../src/config.py:1990 ../src/config.py:2068 ../src/config.py:2081
-#: ../src/config.py:3170 ../src/config.py:3238 ../src/dialogs.py:293
+#: ../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:2754 ../src/roster_window.py:2760
-#: ../src/roster_window.py:2765
+#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
+#: ../src/roster_window.py:2800
 msgid "None"
 msgstr "Żaden"
 
 #: ../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 "Informacje osobiste"
@@ -381,12 +386,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 "Priory_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 "
@@ -397,7 +402,7 @@ msgstr ""
 "który ma wyższy priorytet, będzie odbierał wiadomości"
 
 #: ../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 "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu."
 
@@ -406,12 +411,12 @@ msgid "Proxy:"
 msgstr "Serwer Proxy:"
 
 #: ../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 "Za_sób: "
 
 #: ../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 "
@@ -430,7 +435,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Zapisz _hasło (nie jest to bezpieczne)"
 
 #: ../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 "Zapisz _logi rozmów dla wszystkich kontaktów"
 
@@ -439,12 +444,12 @@ msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
 #: ../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 "Synch_ronizuj status konta z globalnym statusem"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Synchronizuj kontakty"
@@ -454,7 +459,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Korzystaj z _SSL"
 
 #: ../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 "Używaj serwerów proxy do przesyłania plików"
 
@@ -463,7 +468,7 @@ msgid "_Adjust to status"
 msgstr "_Dostosuj do statusu"
 
 #: ../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 "_Nazwa: "
 
@@ -479,7 +484,12 @@ msgstr "D_ostosuj do statusu"
 msgid "Accounts"
 msgstr "Konta"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Używaj aut_oryzacji serwera proxy"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -487,26 +497,26 @@ msgstr ""
 "Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez "
 "nieszyfrowane połączenie."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../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 "Adres e-mail:"
 
-#: ../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 "Imię:"
 
-#: ../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 ""
 "Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. 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"
@@ -516,84 +526,85 @@ msgstr ""
 "odpowiada ci, możesz wskazać numer portu, jakiego chcesz używać.\n"
 "Konieczna stać się może ponowna konfiguracja firewalla."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:780
+#: ../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 "Nazwisko:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Połącz konta"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5178
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Send _keep-alive packets"
 msgstr "Wysyłaj pakiety _podtrzymujące"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Synchroni_ze account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 msgid "Use G_PG Agent"
 msgstr "Użyj Agenta G_PG"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use cust_om hostname/port"
 msgstr "Użyj wła_snej nazwy hosta/portu"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use cust_om port:"
 msgstr "Użyj inn_ego portu:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 msgid "_Edit Personal Information..."
 msgstr "_Zmień informacje o sobie..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Enable"
 msgstr "_Włącz"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Hostname: "
 msgstr "_Nazwa hosta: "
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Manage..."
 msgstr "Zarządzaj..."
 
-#: ../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 "_Ostrzegaj przed użyciem niezaszyfrowanego połączenia"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_używaj zmiennej środowiskowej HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -782,7 +793,7 @@ msgid "All statuses"
 msgstr "Dowolny status"
 
 #: ../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 "Zaraz wracam"
 
@@ -799,7 +810,7 @@ msgid "Have "
 msgstr "rozmawiam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Niewidoczny"
 
@@ -808,7 +819,7 @@ msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Nieobecny"
 
@@ -927,7 +938,7 @@ msgstr "Ostatnio zmodyfikowany:"
 msgid "New entry received"
 msgstr "Odebrano nowy wpis"
 
-#: ../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 "Otrzymałeś nowy artykuł:"
 
@@ -1043,11 +1054,11 @@ msgstr "Dod_aj do listy kontaktów"
 
 #: ../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:5874
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historia"
 
@@ -1155,7 +1166,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Gdy plik w całości zostanie przesłany, wyświetl okno powiadomienia"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -1191,7 +1202,7 @@ msgstr ""
 "Kontakt\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:768
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Wytłuszczone"
 
@@ -1215,7 +1226,7 @@ msgstr "Zniknął"
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:769
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kursywa"
 
@@ -1263,7 +1274,7 @@ msgstr "Zmień _temat..."
 msgid "Configure _Room..."
 msgstr "Konfiguruj _pokój..."
 
-#: ../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 "Dodaj _zakładkę dla tego pokoju"
 
@@ -1295,23 +1306,37 @@ msgstr "_Administrator"
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../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 "_Zablokuj"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Uczestnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Właściciel"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../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 "_Cofnij blokadę"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Głos"
 
@@ -1319,13 +1344,13 @@ msgstr "_Głos"
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../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 "Od"
 
 #. 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 "Temat"
 
@@ -1344,7 +1369,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Witaj w menedżerze historii rozmów Gajima</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 "Usuń"
 
@@ -1398,7 +1424,7 @@ msgstr "Szukaj"
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1803
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
@@ -1425,8 +1451,8 @@ msgstr "Ostatnio:"
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../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 "_Dołącz"
 
@@ -1454,7 +1480,7 @@ msgstr "Minimalizuj po automatycznym wejściu"
 msgid "Print status:"
 msgstr "Wyświetlaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Serwer:"
 
@@ -1483,10 +1509,6 @@ msgid "<b>Settings</b>"
 msgstr "<b>Ustawienia</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"
@@ -1496,39 +1518,39 @@ 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 "Zarządzaj Profilami Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Proxy _Host:"
 msgstr "_Serwer Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Port:"
 msgstr "_Port Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr "Korzystaj z pośrednik_a HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "Use proxy auth_entication"
 msgstr "Używaj aut_oryzacji serwera proxy"
 
-#: ../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:16
+#: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Nazwa użytkownika:"
 
@@ -1579,7 +1601,7 @@ msgstr "Pokaż profil kontaktu (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 "_Wyślij"
 
@@ -2182,7 +2204,7 @@ msgstr "JID"
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2688
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Poufna Lista"
 
@@ -2326,7 +2348,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:323
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Rola:</b>"
 
@@ -2386,8 +2408,8 @@ msgstr "Usuń konto z Gajima i z _serwera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5215
-#: ../src/roster_window.py:5693 ../src/roster_window.py:5822
+#: ../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 "_Usuń"
 
@@ -2409,14 +2431,14 @@ msgstr "Modyfikuj _grupy..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5133 ../src/roster_window.py:5646
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Za_proś do"
 
@@ -2426,7 +2448,7 @@ msgstr "Us_uń"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5731
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
@@ -2451,12 +2473,6 @@ msgstr "Rozpocznij _rozmowę"
 msgid "_Allow him/her to see my status"
 msgstr "_Pozwól mu/jej widzieć swój status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5206 ../src/roster_window.py:5683
-#: ../src/roster_window.py:5812
-msgid "_Block"
-msgstr "_Zablokuj"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabroń mu/jej widzieć twój status"
@@ -2478,16 +2494,34 @@ msgstr "_Zmień nazwę..."
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5200 ../src/roster_window.py:5677
-#: ../src/roster_window.py:5809
-msgid "_Unblock"
-msgstr "_Cofnij blokadę"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Cofnij ignorowanie"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Dodaj _kontakt..."
@@ -2525,7 +2559,8 @@ msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty _niepołączone"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2542,7 +2577,7 @@ msgstr "_Działania"
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../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 "_Edycja"
 
@@ -2583,11 +2618,11 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5834
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
-#: ../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 "_Szukaj"
 
@@ -2699,10 +2734,6 @@ msgstr "Wyślij _wiadomość"
 msgid "Show All Pending _Events"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Pokaż _listę kontaktów"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2811,13 +2842,13 @@ msgstr "Przypisz klucz Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5666
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5792
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
@@ -2841,25 +2872,25 @@ msgstr "Zasoby:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Cofnij potwierdzenie"
 
-#: ../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 "Jesteś w trakcie wykonywania komendy. Czy na pewno chcesz ją przerwać?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Klient na %s anulował negocjację sesji"
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Usługa wysłała niepoprawne dane"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Klient na %s anulował negocjację sesji"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
@@ -2884,7 +2915,7 @@ msgstr "Liczba całkowita"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:788
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Kolor"
 
@@ -2909,6 +2940,11 @@ msgstr "(Brak)"
 msgid "Hidden"
 msgstr "Ukryte"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Otrzymałeś nowy artykuł:"
+
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
@@ -3019,78 +3055,78 @@ msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:575
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:576
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/chat_control.py:770
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/chat_control.py:771
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Przekreślenie"
 
-#: ../src/chat_control.py:794
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Czcionka:"
 
-#: ../src/chat_control.py:803
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Usuń formatowanie"
 
-#: ../src/chat_control.py:875
+#: ../src/chat_control.py:877
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/chat_control.py:876
+#: ../src/chat_control.py:878
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Jeżeli wyślesz plik do %s, pozna on/ona twój pełny JID."
 
-#: ../src/chat_control.py:1262 ../src/chat_control.py:1651
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1292 ../src/chat_control.py:2153
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:878
-#: ../src/dialogs.py:1005 ../src/dialogs.py:1729 ../src/dialogs.py:1754
-#: ../src/gajim.py:992 ../src/gajim.py:1725 ../src/roster_window.py:910
-#: ../src/roster_window.py:1542 ../src/roster_window.py:1544
-#: ../src/roster_window.py:1890 ../src/roster_window.py:3121
-#: ../src/roster_window.py:3147 ../src/roster_window.py:5327
-#: ../src/roster_window.py:5512
+#: ../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 "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1305
+#: ../src/chat_control.py:1310
 msgid "This contact does not support file transfer."
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: ../src/chat_control.py:1308
+#: ../src/chat_control.py:1313
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Ty musisz znać prawdziwy JID kontaktu, aby wysłać jej/jemu plik."
 
-#: ../src/chat_control.py:1415 ../src/tooltips.py:626
+#: ../src/chat_control.py:1420 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: ../src/chat_control.py:1417 ../src/tooltips.py:631
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: ../src/chat_control.py:1419 ../src/tooltips.py:636
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:638
+#: ../src/chat_control.py:1427 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3099,17 +3135,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> w wykonaniu <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s z pokoju %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1631 ../src/dialogs.py:4033
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:1632
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3117,50 +3153,50 @@ msgstr ""
 "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować "
 "wiadomości do tego kontaktu, używając GPG."
 
-#: ../src/chat_control.py:1641
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:1667
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1669
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1683
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:1683
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1685
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:1685
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1689
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1693
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "oraz NIE autoryzowana"
 
 #. 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:1699
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3169,26 +3205,26 @@ msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:1747
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Komenda nie jest wspierana dla konta zeroconf."
 
-#: ../src/chat_control.py:1758 ../src/groupchat_control.py:1661
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/chat_control.py:1761 ../src/groupchat_control.py:1675
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/chat_control.py:1764 ../src/groupchat_control.py:1680
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Użycie: /%s ukrywa przyciski czatu."
 
-#: ../src/chat_control.py:1767 ../src/groupchat_control.py:1696
+#: ../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 "
@@ -3197,38 +3233,38 @@ msgstr ""
 "Użycie: /%(command)s <działanie> spowoduje wysłanie działania do aktualnego "
 "pokoju. Używaj w trzeciej osobie. (np. /%(command)s eksploduje.)"
 
-#: ../src/chat_control.py:1772
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uzycie: /%s, wysyła sygnał ping do kontaktu"
 
-#: ../src/chat_control.py:1775
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Użycie: /%s wysyła wiadomość do kontaktu"
 
-#: ../src/chat_control.py:1778 ../src/groupchat_control.py:1719
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
-#: ../src/chat_control.py:1911
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:1928
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3236,25 +3272,25 @@ msgstr ""
 "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
 "tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:1930
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:1964 ../src/chat_control.py:1977
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:1970
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Ta wiadomość została zaszyfrowana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2351
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
 
-#: ../src/chat_control.py:2352
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3262,15 +3298,15 @@ msgstr ""
 "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
 "utracisz tę wiadomość."
 
-#: ../src/chat_control.py:2500 ../src/common/connection_handlers.py:1965
-#: ../src/common/connection_handlers.py:2011
-#: ../src/common/connection_handlers.py:2199
-#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1357
-#: ../src/gajim.py:158
+#: ../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 "Błąd bazy danych"
 
-#: ../src/chat_control.py:2501
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3279,7 +3315,7 @@ msgstr ""
 "Plik (%s) bazy danych nie może zostać odczytany. Spróbuj to naprawić lub "
 "usunąć ten plik (cała historia rozmów będzie usunięta)."
 
-#: ../src/chat_control.py:2731
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
@@ -3288,23 +3324,23 @@ msgstr "%(name)s ma teraz status %(status)s"
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../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 jest plikiem choć powinien być katalogiem"
 
-#: ../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 zakończy teraz działanie"
 
-#: ../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 jest katalogiem choć powinien być plikiem"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
@@ -3368,9 +3404,9 @@ msgstr "Wybierz pokoje, które chcesz opuścić"
 
 #. 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:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5103
+#: ../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 "Pokoje"
 
@@ -3386,73 +3422,73 @@ msgstr "Prześlij dalej nieprzeczytane wiadomości"
 msgid "All unread messages have been forwarded."
 msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Włącz dźwięki, kiedy użytkownik jest zajęty"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "Pokaż tylko połączone i chętne do rozmowy kontakty."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
-#: ../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 (Zaraz wracam z powodu braku aktywności przez $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 ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
-#: ../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 (Status Nieobecny z powodu bezczynności programu powyżej $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 ""
 "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:89
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 "Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', "
 "'podczas_zdarzenia', 'zawsze'."
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "Lista (oddzielona spacjami) kolumn (kont lub grup), które są zwinięte."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:473
-#: ../src/common/optparser.py:228 ../src/common/optparser.py:446
-#: ../src/common/optparser.py:480 ../src/gajim.py:3281
+#: ../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 "domyślny"
 
-#: ../src/common/config.py:110
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Uaktywnij komunikację link-local/zeroconf"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Język używany przez słownik"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3463,7 +3499,7 @@ msgstr ""
 "print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
-#: ../src/common/config.py:115
+#: ../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. "
@@ -3474,18 +3510,18 @@ msgstr ""
 "najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
 "opcja print_time ustawiona jest na 'sometimes'."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Jeśli ma wartość True, to */_ nie będą usuwane. Zatem napis *abc* będzie "
 "pogrubiony ale bez usuniętych znaków * *."
 
-#: ../src/common/config.py:122
+#: ../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/"
@@ -3495,7 +3531,7 @@ msgstr ""
 "zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
 "http://docutils.sourceforge.net/docs/ref/rst/"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3503,7 +3539,7 @@ msgstr ""
 "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
 "czat)"
 
-#: ../src/common/config.py:132
+#: ../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."
@@ -3511,7 +3547,7 @@ msgstr ""
 "Znak proponowany do dodania do nicka w sytuacji, gdy dany nick jest już "
 "używany przez innego uzytkownika czatu"
 
-#: ../src/common/config.py:160
+#: ../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 "
@@ -3522,19 +3558,19 @@ msgstr ""
 "minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy przed nazwą użytkownika"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaki, które wyświetlane są podczas rozmowy za nazwą użytkownika"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3542,11 +3578,11 @@ msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Ile minut powinny być widoczne linie z poprzedniej rozmowy."
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3554,11 +3590,11 @@ msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3567,13 +3603,13 @@ msgstr ""
 "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, "
 "co oznacza użycie wiktionary."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
 "wykorzystaniem gajim-remote."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3586,14 +3622,14 @@ msgstr ""
 "synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
 "połączenia sieciowego."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Wysyłaj informacje o twoim statusie podczas prowadzenia rozmowy. Może "
 "przyjmować wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3601,7 +3637,7 @@ msgstr ""
 "Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje "
 "wartości all, composing_only, disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3610,11 +3646,11 @@ msgstr ""
 "(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
 "czas nadejścia nowej wiadomości."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3623,7 +3659,7 @@ msgstr ""
 "na każdym z pokojów wymienionych na liście (nazwy pokojów rozdzielone "
 "spacją)."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3632,7 +3668,7 @@ msgstr ""
 "prowadzona jest na dowolnym pokoju obecnym na tej liście (nazwy pokojów "
 "rozdzielone spacją)."
 
-#: ../src/common/config.py:186
+#: ../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)"
@@ -3641,7 +3677,7 @@ msgstr ""
 "pewne dane(rozmowy, prywatne rozmowy, grupowe rozmowy, które nie zostaną "
 "zminimalizowane)"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:183
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3649,27 +3685,27 @@ msgstr ""
 "Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania "
 "plików, w przypadku tłumaczenia adresu/przekierowania portu."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Standard IEC mówi, że KiB = 1024 bajty, KB = 100 bajtów."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Powiadamiaj o zdarzeniach za pomocą ikony w obszarze powiadamiania."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Czy pokazywać rozgraniczenie kart w oknie czatu?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:202
+#: ../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 "
@@ -3681,18 +3717,18 @@ msgstr ""
 "16, 17 i 18. Wyższy numery są bardziej bezpiecznie, lecz obliczanie zajmie "
 "więcej czasu podczas rozpoczynania sesji."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista słów oddzielonych średnikami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:217
+#: ../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."
@@ -3701,14 +3737,14 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Jeśli ma wartość True, Gajim sprawdzi przy każdym uruchomieniu czy jest "
 "domyślnym klientem Jabbera."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3717,7 +3753,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3725,11 +3761,11 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyświetli opis statusu, jeśli nie jest on "
 "pusty, dla każdego kontaktu pod jego nazwą w oknie listy kontaktów."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Zdefiniuj pozycję avatara na liście kontaktów. Lewo lub prawo"
 
-#: ../src/common/config.py:226
+#: ../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."
@@ -3737,7 +3773,7 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, "
 "który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3745,7 +3781,7 @@ msgstr ""
 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub "
 "opisu statusu przez kontakt, z którym rozmawiasz."
 
-#: ../src/common/config.py:228
+#: ../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 "
@@ -3760,30 +3796,30 @@ msgstr ""
 "\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
 "użytkownika do pokoju lub jego opuszczeniu."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Kolor tła dla logujących się kontaktów."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Jeżeli opcja ustawiona jest na True, przywrócone wiadomości będą wyświetlane "
 "mniejszą czcionką."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:236
+#: ../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 "
@@ -3793,7 +3829,7 @@ msgstr ""
 "niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
 "okna programu."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3804,7 +3840,7 @@ msgstr ""
 "wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:241
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3825,35 +3861,35 @@ msgstr ""
 "wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
 "uruchomić program."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
 "oknie rozmowy."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
 "klawisza ESC."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Usuwa z okna rozmowy grupowej listę osób obecnych w pokoju."
 
-#: ../src/common/config.py:248
+#: ../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."
@@ -3861,15 +3897,15 @@ msgstr ""
 "Podczas rozmowy grupowej, pokaż nazwę rozmówcy na początku linii tylko "
 "wówczas, gdy poprzednią wiadomość wysłała inna osoba."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3877,13 +3913,13 @@ msgstr ""
 "Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków "
 "w oknach czatu."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Kombinacja klawiszy Ctrl-Tab przechodzi do następnej karty, o ile w żadnej z "
 "nich nie ma nieprzeczytanych wiadomości."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3891,7 +3927,7 @@ msgstr ""
 "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? "
 "Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
 
-#: ../src/common/config.py:254
+#: ../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 "
@@ -3902,7 +3938,7 @@ msgstr ""
 "ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
 "serwera."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3910,7 +3946,16 @@ msgstr ""
 "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
 "używał Menedżera bazy kluczy GNOME."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
+"używał Menedżera bazy kluczy GNOME."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3919,7 +3964,7 @@ msgstr ""
 "połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
 "grupy"
 
-#: ../src/common/config.py:257
+#: ../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"
@@ -3928,7 +3973,7 @@ msgstr ""
 "Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
 "wiadomość"
 
-#: ../src/common/config.py:258
+#: ../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."
@@ -3937,7 +3982,7 @@ msgstr ""
 "kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
 "nie jest już otwarte."
 
-#: ../src/common/config.py:259
+#: ../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."
@@ -3946,13 +3991,13 @@ msgstr ""
 "$$ i $$ do postaci obrazu (z wykorzystaniem dvips) przed wstawieniem ich do "
 "okna rozmowy."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Wymagany jest okres nieaktywności zanim zamknięte zostanie okno zmiany "
 "statusu."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3960,7 +4005,7 @@ msgstr ""
 "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
 "usuwane."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3968,17 +4013,17 @@ msgstr ""
 "Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
 "powiadomień."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Zmień rozmiar pokazywanych formuł latex-a."
 
-#: ../src/common/config.py:265
+#: ../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 separately)"
@@ -3986,7 +4031,7 @@ msgstr ""
 "Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako "
 "\"prawdziwe\" uri. (mailto i xmpp są traktowane oddzielnie)"
 
-#: ../src/common/config.py:266
+#: ../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!"
@@ -3995,7 +4040,7 @@ msgstr ""
 "kiedy jest połączenie z kontem. OSTRZEŻENIE: To może być przyczyną wysyłania "
 "wielu zapytań!"
 
-#: ../src/common/config.py:277
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4003,7 +4048,7 @@ msgstr ""
 "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
 "zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: ../src/common/config.py:285
+#: ../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"
@@ -4012,28 +4057,28 @@ msgstr ""
 "rozmowy, zaraz wracam, nieobecny, nie przeszkadzać, niewidoczny. UWAGA: ta "
 "opcja będzie używana tylko jeśli restore_last_status będzie wyłączone"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Jeśli włączone, przywróc ostatni status, który był użyty."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Po wyłączeniu tej opcji, Gajim nie podpisuje komunikatów o stanach kluczem "
 "GPG, nawet jeśli GPG jest skonfigurowany."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Włączono szyfrowanie ESession dla tego konta."
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to "
 "możliwe?"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4041,30 +4086,30 @@ msgstr ""
 "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
 "Może zawierać tls, ssl lub plain"
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 "Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
 "program będzie ignorował."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:304
 msgid "Whitespace sent after inactivity"
 msgstr "Wysyłanie białych znaków po nieaktywności"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:305
 msgid "XMPP ping sent after inactivity"
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:309
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4073,11 +4118,11 @@ msgstr ""
 "połączenie przed podjęciem próby ponownego połączenia."
 
 #. yes, no, ask
-#: ../src/common/config.py:317
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4085,15 +4130,15 @@ msgstr ""
 "Jeżeli ta opcja jest aktywna, Gajim pobierze adresy serwerów proxy z klucza "
 "file_transfers_proxies i użyje ich podczas przesyłania plików."
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Wyślij żądanie potwierdzenia"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4101,11 +4146,11 @@ msgstr ""
 "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
 "logować?"
 
-#: ../src/common/config.py:407
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:408
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4113,101 +4158,101 @@ msgstr ""
 "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
 "kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:409 ../src/common/config.py:412
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Język, którego używa słownik przy sprawdzaniu pisowni"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:420 ../src/common/config.py:422
-#: ../src/common/config.py:423 ../src/common/config.py:426
-#: ../src/common/config.py:427
+#: ../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' lub \""
 
-#: ../src/common/config.py:433 ../src/common/pep.py:160
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:130
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:437 ../src/common/pep.py:189
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:452 ../src/config.py:1414
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:455 ../src/common/config.py:456
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4216,98 +4261,98 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Dźwięk, jaki będzie odtwarzany, gdy nadejdzie wiadomość MUC."
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:242
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:480 ../src/common/optparser.py:228
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:488
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "morski"
 
-#: ../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 "Nie można załadować modułu idle"
 
-#: ../src/common/connection_handlers.py:236
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Błędna nazwa hosta"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Niepoprawny adres lokalny? :-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 "Informacje rejestracyjne transportu %s nie dotarły na czas"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:684
 msgid "Registration succeeded"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:685
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Rejestracja z %s zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 msgid "Registration failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: ../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"
 msgstr ""
 "Rejestracja z %(agent)s nie powiodła się, błąd %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:970
-#: ../src/common/connection_handlers.py:1963
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2197
-#: ../src/common/connection_handlers.py:2330 ../src/common/connection.py:1355
-#: ../src/gajim.py:378
+#: ../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 "Błąd zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:1177 ../src/common/connection.py:929
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:1178 ../src/common/connection.py:930
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1791 ../src/common/connection.py:1170
-#: ../src/config.py:1844 ../src/config.py:1852 ../src/config.py:1895
-#: ../src/config.py:3120 ../src/dataforms_widget.py:537 ../src/dialogs.py:2462
+#: ../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 "Niepoprawny Jabber ID"
 
-#: ../src/common/connection_handlers.py:1792
+#: ../src/common/connection_handlers.py:1892
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Doszła wiadomość od nieprawidłowego JID, będzie zignorowana"
 
-#: ../src/common/connection_handlers.py:1966
-#: ../src/common/connection_handlers.py:2012
-#: ../src/common/connection_handlers.py:2200
-#: ../src/common/connection_handlers.py:2333 ../src/common/connection.py:1358
-#: ../src/gajim.py:159
+#: ../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."
@@ -4317,78 +4362,77 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) lub usuń ten plik(całe archiwum "
 "rozmów zostanie usunięte)."
 
-#: ../src/common/connection_handlers.py:2084
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2159
-#: ../src/common/connection_handlers.py:2162
-#: ../src/common/connection_handlers.py:2165
-#: ../src/common/connection_handlers.py:2168
-#: ../src/common/connection_handlers.py:2172 ../src/gajim.py:531
+#: ../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 "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:2160
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2163
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:2169
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Twój pseudonim musi być używany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2173
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2215
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:2222
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: ../src/common/connection_handlers.py:2249
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2270
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:2272
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:2457
+#: ../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 "
@@ -4399,15 +4443,15 @@ msgstr ""
 "jabberstudio.org/ aby go usunąć"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2482
+#: ../src/common/connection_handlers.py:2614
 #: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2484
+#: ../src/common/connection_handlers.py:2616
 #: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1931
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
@@ -4540,81 +4584,81 @@ msgstr "Tym kluczem nie można podpisywać certyfikatu"
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %"
 "(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s udzielił nieprawidłowej odpowiedzi na żądanie "
 "rejestracji: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:762
-#: ../src/common/connection.py:1491
+#: ../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 "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1087
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:645
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:742
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:743
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Połączenie z kontem %s zostało zerwane."
 
-#: ../src/common/connection.py:709
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Nie można potwierdzić autentyczności certyfikatu %s."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4623,7 +4667,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4632,24 +4676,24 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:763
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:788
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:856
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4658,19 +4702,19 @@ msgstr ""
 "Lista prywatności %s nie została usunięta. Prawdopodobnie jest aktywna w "
 "jednym z połączonych zasobów. Wyłącz ją i spróbuj ponownie."
 
-#: ../src/common/connection.py:1171 ../src/dialogs.py:2463
+#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Niemożna wysłać wiadomości do %s, JID jest nieprawidłowy."
 
-#: ../src/common/connection.py:1193
+#: ../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 ""
 "Komunikat o statusie obecności nie jest podpisany, nie przypisano mu też "
 "klucza."
 
-#: ../src/common/connection.py:1195
+#: ../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."
@@ -4678,11 +4722,11 @@ msgstr "Klucz kontaktu (%s) nie pasuje do klucza przypisanego w Gajimie."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
-#: ../src/common/connection.py:1345
+#: ../src/common/connection.py:1359
 #: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
@@ -4692,20 +4736,30 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1524 ../src/common/connection.py:1545
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Zaproś kontakty"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:992
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Obserwatorzy"
 
 #: ../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:801 ../src/roster_window.py:814
-#: ../src/roster_window.py:1469 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1684
+#: ../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 "Transporty"
 
@@ -4714,11 +4768,11 @@ msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
 #. 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 "Na tym komputerze brakuje pythonowych dowiązań do D-Bus."
 
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Nie można użyć D-Bus."
 
@@ -4750,356 +4804,356 @@ msgstr ""
 "Nie znaleziono interfejsu DBus.\n"
 "Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dwunastej"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "pierwsza"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "druga"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "trzecia"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "czwarta"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "piąta"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "szóstej"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "siódma"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "ósmej"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "dziewiąta"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dziesiątej"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "jedenasta"
 
+#. 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 "dwunastej"
-
-#. 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 "Godzina $0"
+msgid "%(0)s o'clock"
+msgstr "Godzina %(0)s"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "pięć po $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "pięć po %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "dziesięć po $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "dziesięć po %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kwadrans po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "kwadrans po %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dwadzieścia po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "dwadzieścia po %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "za pięć wpół do $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "za pięć wpół do %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "w pół do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "w pół do %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "pięć po wpół do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "pięć po wpół do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "za dwadzieścia $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "za dwadzieścia %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "za kwadrans $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "za kwadrans %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "za dziesięć $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "za dziesięć %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "za pięć $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "za pięć %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "godzina $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "godzina %(1)s"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noc"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Wczesny poranek"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "rano"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Prawie południe"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "w południe"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Popołudnie"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "wieczorem"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Późny wieczór"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Początek tygodnia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Środek tygodnia"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Koniec tygodnia"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../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 "Uczestnicy"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "pisze wiadomość..."
 
 #. 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 "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:653
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:666
+#: ../src/common/helpers.py:656
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:660
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:663
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:677
+#: ../src/common/helpers.py:667
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:680
+#: ../src/common/helpers.py:670
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:683
+#: ../src/common/helpers.py:673
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1189
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5107,22 +5161,22 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1195
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1198 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1200
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1207 ../src/common/helpers.py:1214
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5130,7 +5184,7 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1247
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5151,15 +5205,15 @@ msgstr "%s nie jest prawidłowym poziomem logowania"
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:237 ../src/common/optparser.py:238
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:354
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "Konto XMPP %s@%s"
@@ -5887,19 +5941,19 @@ msgstr "Twoja wiadomość nie mogła zostać wysłana."
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt jest rozłączony. Twoja wiadomość nie mogła zostać wysłana."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:588
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
 
-#: ../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 "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:151 ../src/config.py:610
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Wyłączone"
 
@@ -5911,20 +5965,12 @@ msgstr "Domyśla wiadomość"
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:446
-msgid "Always use OS/X default applications"
-msgstr "Zawsze używaj domyślnych apikacji OS X"
-
-#: ../src/config.py:447
-msgid "Custom"
-msgstr "Własne"
-
-#: ../src/config.py:676 ../src/dialogs.py:1301
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:677
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5933,212 +5979,212 @@ msgstr ""
 "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
 "inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1056
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1056
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1336 ../src/dialogs.py:1929 ../src/dialogs.py:1993
-#: ../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 "Nazwa"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
 "zalogować się ponownie."
 
-#: ../src/config.py:1551 ../src/config.py:1652
+#: ../src/config.py:1521 ../src/config.py:1643
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1688 ../src/config.py:1733
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1689
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1715
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: ../src/config.py:1729
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1730
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1734
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1740
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1741
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Posiadasz już konto o tej nazwie. Zmień nazwę konta na unikalną."
 
-#: ../src/config.py:1745 ../src/config.py:1749
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1746
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1750
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1825
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:1853
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2043 ../src/config.py:3180
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2044 ../src/config.py:3181
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2066
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2109
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2110
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Musisz najpierw stworzyć konto by móc edytować informacje o sobie."
 
-#: ../src/config.py:2117 ../src/dialogs.py:1781 ../src/dialogs.py:1917
-#: ../src/dialogs.py:2096 ../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 "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2118
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Musisz być połączony, aby móc zmieniać informacje o sobie."
 
-#: ../src/config.py:2122
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2123
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2154
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2155
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2338
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2376
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2428 ../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:2438
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2445
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2451
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2480
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6146,11 +6192,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2483
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6158,11 +6204,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2485
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2486
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6170,11 +6216,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2489
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6182,7 +6228,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2490
+#: ../src/config.py:2500
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6198,76 +6244,88 @@ msgstr ""
 "4. domena (dotyczy domeny a także dowolnego adresu typu użytkownik@domena,\n"
 "domena/zasób lub adresu zawierającego subdomenę)."
 
-#: ../src/config.py:2587
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2609 ../src/gajim.py:1476 ../src/gajim.py:1563
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2610 ../src/gajim.py:1546
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2611 ../src/gajim.py:1563
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2620
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2621
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2717
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2717
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2718
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:2787
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Upewnij się, że wypełniłeś pola serwer i pokój lub usuń tę zakładkę."
 
-#: ../src/config.py:3103
-msgid "Invalid username"
-msgstr "Niepoprawna nazwa użytkownika"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Niepoprawny pseudonim"
 
-#: ../src/config.py:3105
-msgid "You must provide a username to configure this account."
-msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Pseudonim jest niedozwolony: %s"
 
-#: ../src/config.py:3137
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Niepoprawna nazwa serwera"
+
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Niepoprawny wpis"
+
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3138 ../src/config.py:3329
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6276,26 +6334,34 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wciskając przycisk Zaawansowane lub "
 "później wybierając pozycję Konta z menu Edycja w głównym oknie programu."
 
-#: ../src/config.py:3156
-msgid "Invalid server"
-msgstr "Niepoprawna nazwa serwera"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3157
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Niepoprawna nazwa użytkownika"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3208 ../src/gajim.py:2105
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3209 ../src/gajim.py:2106
+#: ../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 ""
 "Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie "
 "dodany."
 
-#: ../src/config.py:3277
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6310,7 +6376,7 @@ msgstr ""
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3283 ../src/gajim.py:2130
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6321,67 +6387,63 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3308 ../src/config.py:3349
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3328
-msgid "Your new account has been created successfully"
-msgstr "Twoje konto zostało założone"
-
-#: ../src/config.py:3415
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3416
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:3569
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:3577
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:3612
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:3613
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:3615
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:3616
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:3617
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:3618
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:3619
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:3620
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:3621
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
-#: ../src/conversation_textview.py:567
+#: ../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"
@@ -6391,7 +6453,7 @@ msgstr ""
 "odebrana. Jeśli ta ikona zostanie przez długi czas,\n"
 "może oznaczać, że wiadomości została zgubiona."
 
-#: ../src/conversation_textview.py:586
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6399,56 +6461,56 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju\n"
 "od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten pokój"
 
-#: ../src/conversation_textview.py:699
+#: ../src/conversation_textview.py:702
 #, fuzzy
 msgid "_Quote"
 msgstr "_Zakończ"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:718
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:753
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
-#: ../src/conversation_textview.py:1219
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1223
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1257
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -6510,114 +6572,114 @@ msgstr "Informacja o statusie %s"
 msgid "Status Message"
 msgstr "Opis statusu"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Status o tej nazwie jest w użyciu. Czy chcesz go zmienić?"
 
-#: ../src/dialogs.py:755
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Szablony opisów"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Podaj nazwę dla tego szablonu"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "_Adres AIM:"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Numer GG:"
 
-#: ../src/dialogs.py:783
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Numer ICQ:"
 
-#: ../src/dialogs.py:784
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "_Adres MSN:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Adres _Yahoo:"
 
-#: ../src/dialogs.py:821
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s"
 
-#: ../src/dialogs.py:823
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać"
 
-#: ../src/dialogs.py:980 ../src/dialogs.py:986 ../src/dialogs.py:991
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:987
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:1007
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:1043
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:1102
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1113
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1121
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "I wreszcie, chcielibyśmy podziękować wszystkim opiekunom pakietów."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1140
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
 "Maciej Chojnacki <maciej@chojnacki.name>Sławomir Domagała <godlark@gmail.com>"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6629,89 +6691,89 @@ msgstr ""
 "inny język korzystać z opcji speller_langugage.\n"
 "Do tego czasu podświetlanie błędnie wpisanych słów nie będzie działało"
 
-#: ../src/dialogs.py:1706
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prośba o autoryzację dla konta %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1709
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:1774 ../src/gajim.py:2777
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:1782
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nie możesz dołączyć do pokoju gdy nie jesteś połączony."
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:1872
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:1873 ../src/groupchat_control.py:1458
-#: ../src/groupchat_control.py:1742
-msgid "The nickname has not allowed characters."
-msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
-
-#: ../src/dialogs.py:1877 ../src/dialogs.py:1883
-#: ../src/groupchat_control.py:1930
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:1878 ../src/dialogs.py:1884
-#: ../src/groupchat_control.py:1931
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:1891
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:1918
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:1966
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: ../src/dialogs.py:1990
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:2048
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:2051
+#: ../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:"
@@ -6720,274 +6782,300 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2075 ../src/dialogs.py:2448 ../src/dialogs.py:2610
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:2076 ../src/dialogs.py:2449 ../src/dialogs.py:2611
+#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:2085 ../src/dialogs.py:2088
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:2088
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Nie możesz zmienić hasła, jeśli nie jesteś połączony."
 
-#: ../src/dialogs.py:2116
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2116
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2121
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2160 ../src/notify.py:264 ../src/notify.py:505
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2162 ../src/notify.py:272 ../src/notify.py:507
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2164 ../src/notify.py:295 ../src/notify.py:349
-#: ../src/notify.py:509 ../src/osx/growler.py:12
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2164 ../src/notify.py:276 ../src/notify.py:350
-#: ../src/notify.py:509 ../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 "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2165 ../src/notify.py:283 ../src/notify.py:350
-#: ../src/notify.py:510 ../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 "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2165 ../src/gajim.py:1679 ../src/notify.py:519
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2167 ../src/gajim.py:1745 ../src/notify.py:512
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2169 ../src/gajim.py:1645 ../src/gajim.py:1712
-#: ../src/notify.py:514 ../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 "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2171 ../src/gajim.py:1787 ../src/gajim.py:1809
-#: ../src/gajim.py:1826 ../src/notify.py:516 ../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 "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2172 ../src/gajim.py:1790 ../src/notify.py:517
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2174 ../src/gajim.py:1497 ../src/notify.py:521
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2176 ../src/notify.py:256 ../src/notify.py:523
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2367
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2369
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2371
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2374
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2420
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Od %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2499
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:2551
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:2682
+#. 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 "Chciałbym dodać Cię do listy kontaktów."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Edytuj"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupa"
+
+#. 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 "Chciałbym dodać Cię do listy kontaktów."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:2742
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Kolejność: %(order)s, akcja: %(action)s, typ: %(type)s, wartość: %(value)s"
 
-#: ../src/dialogs.py:2747
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:2876
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:2972
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:2974
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:3077
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:3080
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:3082
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasza cię do pokoju %(room_jid)s"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:3092
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3148
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3158 ../src/dialogs.py:3212
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:3199
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:3217
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:3284
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
 #. # means number
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "Nr"
 
-#: ../src/dialogs.py:3359
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:3477
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:3949
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6998,19 +7086,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3953
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:3959 ../src/dialogs.py:4046
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:3967
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:3972
+#: ../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 "
@@ -7020,19 +7108,19 @@ msgstr ""
 "wiadomości lub wysyłać wiadomości do ciebie, powinieneś zweryfikować ich "
 "tożsamość poprzez kliknięcie przycisku poniżej."
 
-#: ../src/dialogs.py:3975 ../src/dialogs.py:4027 ../src/dialogs.py:4040
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:3982
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:3994
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:3995
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7046,23 +7134,23 @@ msgstr ""
 "zobaczy ten sam Short Authentication String (SAS) jak ty.\n"
 "Tej sesji Short Authentication String to <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3996
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Czy rozmawiałeś(aś) ze zdalnym rozmówcą i zweryfikowałeś(aś) SAS?"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Klucz kontaktu (%s) <b>nie pasuje</b> do klucza przypisanego w Gajimie."
 
-#: ../src/dialogs.py:4034
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować "
 "wiadomości do niego, używając GPG."
 
-#: ../src/dialogs.py:4041
+#: ../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."
@@ -7071,7 +7159,7 @@ msgstr ""
 "klucza</b>, więc wiadomość <b>nie będzie</b> odszyfrowana. Użyj twojego "
 "klienta GPG, aby importować klucz."
 
-#: ../src/dialogs.py:4047
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7079,33 +7167,33 @@ msgstr ""
 "Ten użytkownik ma przypisany klucz, zweryfikowałeś ten klucz, więc "
 "wiadomości będą szyfrowane"
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Inni"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:657
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../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."
@@ -7113,269 +7201,287 @@ msgstr ""
 "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
 "adres i spróbuj ponownie."
 
-#: ../src/disco.py:662 ../src/disco.py:958
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:663
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:700 ../src/disco.py:710
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/disco.py:757
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Przeglądanie %(address)s przy użyciu konta %(account)s"
 
-#: ../src/disco.py:797
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:959
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Usługa nie zawiera elementów, które można przeglądać."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Wykonaj komendę"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1581
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Opis"
 
 #. 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 "Zakładka została już dodana"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Zakładka została dodana"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 msgid "SSL certificat validation"
 msgstr "Sprawdzanie certyfikatu SSL"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka używana do weryfikacji certyfikatów w celu zapewnienia "
 "bezpiecznego połączenia."
 
-#: ../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 "Wymaga 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 ""
 "Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym "
 "wykrywaniem klientów."
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Wymaga python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Wymaga pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Command line"
 msgstr "Linia poleceń"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Skrypt pozwalający na sterowanie Gajimem z linii poleceń."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Wymaga 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 "Funkcjonalność niedostępna dla systemu Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "OpenGPG message encryption"
 msgstr "Szyfrowanie OpenPGP"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Szyfrowanie wiadomości kluczami GPG."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Wymaga GPG oraz python-GnuPGInterface."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 msgid "Network-manager"
 msgstr "Menedżer sieci"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Automatyczne wykrywanie stanu sieci."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Wymaga gnome-network-manager oraz python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Zarządzanie sesją"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy "
 "logowaniu."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Wymaga python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Password encryption"
 msgstr "Hasło"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Bezpieczne przechowywanie haseł."
 
-#: ../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 "Wymaga gnome-keyring oraz python-gnome-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 "Możliwość połączenia z serwerami, które używają rekordów SRV."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Wymaga dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Wymaga nslookup."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Słownik"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Zwraca uwagę na błędy w wysyłanych wiadomościach."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires libgtkspell."
 msgstr "Wymaga libgtkspell"
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Notification"
 msgstr "Powiadomienia"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Wyświetla okna informujące o nowych zdarzeniach."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Wymaga python-notify lub python-dbus w połączeniu z notification-daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Ikona w obszarze powiadamiania"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ikona w obszarze powiadamiania odzwierciedla aktualny status."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Wymaga python-gnome2-extras lub skompilowanego modułu trayicon ze źródeł "
 "Gajima."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Wymaga PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatyczny status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Wymaga biblioteki libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Wymaga 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 "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
 
-#: ../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."
@@ -7383,7 +7489,7 @@ msgstr ""
 "Wymaga texlive-latex-base, dvipng. Musisz ustawić zmienną 'use_latex' na "
 "'True'  w Zaawansowanym Edytorze Ustawień."
 
-#: ../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."
@@ -7391,23 +7497,23 @@ msgstr ""
 "Wymaga texlive-latex-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić "
 "zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "Szyfrowanie typu \"end to end\""
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "Szyfrowanie wysyłanych wiadomości."
 
-#: ../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 "Wymaga python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Generator RST"
 
-#: ../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)."
@@ -7415,23 +7521,23 @@ msgstr ""
 "Tworzy XHTML z kodu RST (patrz http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html)."
 
-#: ../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 "Wymaga python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr "Banery i klikalne linki"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr "Dodaje możliwość wyświetlania aktywnych ('klikalnych') adresów URL."
 
-#: ../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 "Wymaga python-sexy"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Możliwości"
 
@@ -7452,7 +7558,7 @@ msgstr "Postęp"
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
@@ -7460,7 +7566,7 @@ msgstr "Rozmiar: %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 "Ty"
 
@@ -7469,7 +7575,7 @@ msgstr "Ty"
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
 #: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Odbiorca: "
@@ -7502,84 +7608,85 @@ msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Opis: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie może uzyskać dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:334 ../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."
 msgstr ""
 "Istnieje już plik o tej nazwie a Ty nie masz uprawnień do jego nadpisania."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "<b>Co chcesz zrobić?</b>"
 
 #. 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:360 ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Nie masz uprawnień do zapisu w folderze \"%s\""
 
-#: ../src/filetransfers_window.py:360 ../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 "Nie masz uprawnień do tworzenia plików w tym folderze."
 
-#: ../src/filetransfers_window.py:370
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Zapisz obraz jako..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:436
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7587,64 +7694,69 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:593 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:595 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/gajim.py:145
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
 
-#: ../src/gajim.py:174
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim wymaga PyGTK w wersji 2.12 lub wyższej"
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:171
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim wymaga do działania PyGTK w wersji 2.12 lub wyższej. Zamykanie "
 "programu..."
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:173
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim wymaga GTK w wersji 2.12 lub wyższej"
 
-#: ../src/gajim.py:178
+#: ../src/gajim.py:174
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim wymaga do działania GTK w wersji 2.12 lub wyższej. Zamykanie "
 "programu..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "W GTK+ brakuje wsparcia dla libglade"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7652,22 +7764,22 @@ msgid ""
 msgstr ""
 "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
 "libglade."
 
-#: ../src/gajim.py:192
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim wymaga do działania PySQLite2"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim wymaga do działania pakietu pywin32"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7677,11 +7789,11 @@ msgstr ""
 "spod adresu %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:352
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim jest już uruchomiony"
 
-#: ../src/gajim.py:353
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7689,35 +7801,35 @@ msgstr ""
 "Wydaje się, że w tle działa już inna kopia Gajima.\n"
 "Czy mimo to chcesz uruchomić program?"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
 
-#: ../src/gajim.py:458
+#: ../src/gajim.py:443
 msgid "GPG key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: ../src/gajim.py:459
+#: ../src/gajim.py:444
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Twój klucz GPG stracił ważność, zostaniesz połączony z %s bez OpenGPG"
 
 #. ask again
-#: ../src/gajim.py:468
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/gajim.py:469
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7728,54 +7840,58 @@ msgstr ""
 "innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/gajim.py:546
+#: ../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 "Czy akceptujesz tę prośbę?"
 
-#: ../src/gajim.py:548
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: ../src/gajim.py:551
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:602 ../src/notify.py:525 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/gajim.py:926 ../src/gajim.py:930
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Błąd %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:940 ../src/gajim.py:954
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:981 ../src/notify.py:527
+#: ../src/gajim.py:970 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: ../src/gajim.py:1006
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gajim.py:1007
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" udzielił Ci autoryzacji byś mógł widzieć jego status."
 
-#: ../src/gajim.py:1019
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: ../src/gajim.py:1020
+#: ../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?"
@@ -7783,76 +7899,76 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gajim.py:1045 ../src/notify.py:529
+#: ../src/gajim.py:1034 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzację"
 
-#: ../src/gajim.py:1086
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:1275 ../src/groupchat_control.py:1169
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s występuje teraz jako %(new_nick)s"
 
-#: ../src/gajim.py:1293 ../src/groupchat_control.py:1344
-#: ../src/history_window.py:428 ../src/notify.py:251
+#: ../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 ma teraz status %(status)s"
 
-#: ../src/gajim.py:1360
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ustawił temat na %(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:1424 ../src/groupchat_control.py:1129
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
-#: ../src/gajim.py:1427
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/gajim.py:1437
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/gajim.py:1439
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/gajim.py:1442
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/gajim.py:1445
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: ../src/gajim.py:1477
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Aby dołączyć do pokoju %s wymagane jest hasło. Proszę je wpisać"
 
-#: ../src/gajim.py:1511
+#: ../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"
@@ -7860,19 +7976,19 @@ msgstr ""
 "Skonfigurowałeś Gajima by używał agenta GPG, ale agent nie jest uruchomiony "
 "lub zwraca błędne hasło.\n"
 
-#: ../src/gajim.py:1513
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gajim.py:1516
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gajim.py:1539
+#: ../src/gajim.py:1528
 msgid "GPG key not trusted"
 msgstr "GPG nie jest zaufany"
 
-#: ../src/gajim.py:1539
+#: ../src/gajim.py:1528
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -7880,13 +7996,13 @@ msgstr ""
 "Klucz GPG używany do szyfrowania tej rozmowy nie jest zaufany. Czyn naprawdę "
 "chcesz zaszyfrować tą wiadomość?"
 
-#: ../src/gajim.py:1541 ../src/gajim.py:2188 ../src/gajim.py:2223
-#: ../src/groupchat_control.py:1871 ../src/message_window.py:212
-#: ../src/roster_window.py:3867
+#: ../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 "_Nie pytaj mnie o to ponownie"
 
-#: ../src/gajim.py:1549
+#: ../src/gajim.py:1540
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -7895,12 +8011,12 @@ msgstr ""
 "\tprawidłowo uruchomiony(zmienna środowiskowa prawdopodobnie nie jest \t\t\t"
 "\t właściwie ustawiona)"
 
-#: ../src/gajim.py:1656
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1658
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7908,7 +8024,7 @@ msgstr[0] "Masz %d nieprzeczytaną wiadomość pocztową"
 msgstr[1] "Masz %d nieprzeczytane wiadomości pocztowe"
 msgstr[2] "Masz %d nieprzeczytane wiadomości pocztowe"
 
-#: ../src/gajim.py:1671
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7923,34 +8039,44 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gajim.py:1810
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Usuwa kontakt z listy kontaktów"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Błąd odczytu pliku:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Otrzymałeś plik %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1814
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s od %(name)s zostało zatrzymane."
 
-#: ../src/gajim.py:1827
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1831
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Przesyłanie pliku %(filename)s do %(name)s zostało zatrzymane."
 
-#: ../src/gajim.py:1928
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7959,36 +8085,36 @@ msgstr ""
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: ../src/gajim.py:1935
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gajim.py:2009
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gajim.py:2010
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gajim.py:2022
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2035
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2046
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Błąd."
 
-#: ../src/gajim.py:2071
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gajim.py:2072
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7996,11 +8122,11 @@ msgstr ""
 "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
 "podać nowy zasób"
 
-#: ../src/gajim.py:2127
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gajim.py:2128
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8011,15 +8137,15 @@ msgstr ""
 "s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: ../src/gajim.py:2133
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gajim.py:2153
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: ../src/gajim.py:2154
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8036,11 +8162,11 @@ msgstr ""
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gajim.py:2184 ../src/gajim.py:2219
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: ../src/gajim.py:2185
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8048,11 +8174,11 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś "
 "pewien?"
 
-#: ../src/gajim.py:2187 ../src/gajim.py:2222
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: ../src/gajim.py:2220
+#: ../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?"
@@ -8060,21 +8186,21 @@ msgstr ""
 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
 "Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gajim.py:2240
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: ../src/gajim.py:2241
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Węzeł PEP %(node)s nie został usunięty: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2734 ../src/gajim.py:2756
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gajim.py:2735
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8082,7 +8208,7 @@ msgstr ""
 "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
 "wyłączone."
 
-#: ../src/gajim.py:2757
+#: ../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 "
@@ -8092,55 +8218,38 @@ msgstr ""
 "potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
 "szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2783 ../src/roster_window.py:3355
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3062
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: ../src/gajim.py:3159
-msgid "Bookmark already set"
-msgstr "Zakładka została już dodana"
-
-#: ../src/gajim.py:3160
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
-
-#: ../src/gajim.py:3173
-msgid "Bookmark has been added successfully"
-msgstr "Zakładka została dodana"
-
-#: ../src/gajim.py:3174
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Możesz zarządzać zakładkami poprzez menu Działania w oknie kontaktów."
-
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Wyświetla pomoc dla wybranego polecenia"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "polecenie"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "pokaż pomoc polecenia"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Pokazuje lub ukrywa okno listy kontaktów"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
-#: ../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"
@@ -8148,49 +8257,50 @@ msgstr ""
 "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
 "osobnej linii"
 
-#: ../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 "pokaż tylko kontakty z danego konta"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Wypisuje listę zarejestrowanych kont"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Zmienia status kont lub kont"
 
 #. 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 ""
 "jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
 "zajęty, niewidoczny "
 
-#: ../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 "wiadomość"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "informacja o statusie"
 
-#: ../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"
@@ -8199,19 +8309,23 @@ msgstr ""
 "zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
 "statusem globalnym"
 
-#: ../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 "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontaktu"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../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 ""
 "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
 #: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8405,51 +8519,56 @@ msgstr "URI do obsługi"
 msgid "Account in which you want to handle it"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "zawartość wiadomości"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "pokój"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Pokój:"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Nick"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "hasło"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Hasło do pokoju"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Wskaż konto, z którym chcesz wejść do pokoju"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno iptyhon"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8458,15 +8577,15 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../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 "Gajim nie jest uruchomiony, nie możesz więc użyć gajim-remote."
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8475,16 +8594,16 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8493,7 +8612,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:482
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8502,7 +8621,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:487
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8511,7 +8630,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie jest określony. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:506
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Błędny adres URI"
 
@@ -8528,15 +8647,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Proszę utworzyć nowy temat i nadać mu nazwę."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nazwa motywu"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Nie możesz skasować obecnie używanego motywu"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
@@ -8550,152 +8669,165 @@ msgstr "Wysyłanie prywatnej wiadomości nie powiodło się"
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Nie jesteś już w pokoju \"%(room)s\" lub \"%(nick)s\" opuścił go."
 
-#: ../src/groupchat_control.py:410
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:562
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:564
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s został wyrzucony przez %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1158
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s został zabanowany przez %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1167
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1205 ../src/groupchat_control.py:1209
-#: ../src/groupchat_control.py:1214
+#: ../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 został wyrzucony z pokoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s przez %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 "** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez %"
 "(actor)s"
 
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uprawnienia użytkownika %(nick)s została zmienione na %(role)s"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1342
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1457 ../src/groupchat_control.py:1741
-msgid "Invalid nickname"
-msgstr "Niepoprawny pseudonim"
-
-#: ../src/groupchat_control.py:1482 ../src/groupchat_control.py:1500
-#: ../src/groupchat_control.py:1586 ../src/groupchat_control.py:1603
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_control.py:1516
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Ten pokój nie ma tematu"
 
-#: ../src/groupchat_control.py:1528
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
-#: ../src/groupchat_control.py:1664
+#: ../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 "Pseudonim nie został odnaleziony: %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 ""
 "Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby "
 "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1671
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr "Użycie: /%s <pseudonim>, otwiera okno prywatnej rozmowy z tą osobą."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8704,7 +8836,7 @@ msgstr ""
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8713,7 +8845,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_control.py:1687
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8722,17 +8854,16 @@ msgstr ""
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_control.py:1691
-#, 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 ""
 "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
 
-#: ../src/groupchat_control.py:1700
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8741,61 +8872,75 @@ msgstr ""
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Użycie: /%s , wyświetla osoby obecne w danym pokoju."
 
-#: ../src/groupchat_control.py:1713
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Użycie: /%s <wiadomość> wysyła wiadomość bez sprawdzania innych poleceń."
 
-#: ../src/groupchat_control.py:1865
+#: ../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 "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
-#: ../src/groupchat_control.py:1867
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Jeśli zamkniesz to okno, połączenie z tym pokojem zostanie zerwane."
 
-#: ../src/groupchat_control.py:1904
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1905
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1910
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1937
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1938
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8803,22 +8948,22 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2111
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:2112 ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2402
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -8849,77 +8994,77 @@ msgstr "Szczegóły"
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Błąd przetwarzania pliku:"
 
 #. 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 ""
 "Nie można zapisywać do %s. Wsparcie dla Menadżera Sesji nie będzie działać"
 
 #. 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 nie jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Czy chciałbyś by Gajim stał się klientem domyślnym?"
 
-#: ../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 "Przy starcie sprawdzaj czy Gajim jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../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 ""
 "Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %"
 "(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/history_manager.py:96
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
 #. holds jid
-#: ../src/history_manager.py:136
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. 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 "Data"
 
 #. 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 "Pseudonim"
 
 #. 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 "Wiadomość"
 
-#: ../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)"
@@ -8927,7 +9072,7 @@ msgstr ""
 "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
 "OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
-#: ../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 "
@@ -8942,27 +9087,27 @@ msgstr ""
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: ../src/history_manager.py:433
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie logów rozmów..."
 
-#: ../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 o godzinie %(time)s napisał: %(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] "Czy na pewno chcesz usunąć historię rozmów wybranego kontaktu?"
 msgstr[1] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 msgstr[2] "Czy na pewno chcesz usunąć historię rozmów wybranych kontaktów?"
 
-#: ../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 "Skutków tej operacji nie można będzie wycofać."
 
-#: ../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] "Czy na pewno chcesz usunąć wybraną wiadomość?"
@@ -9033,70 +9178,66 @@ msgstr "- wiadomości będzie logowanych"
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:259
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:267
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:287
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nowa wiadomość prywatna z pokoju %s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:292
+#: ../src/notify.py:285
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:298
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:569
+#: ../src/notify.py:555
 msgid "Ignore"
 msgstr "Ignoruj"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Ogólne"
-
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2799
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2802
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2804 ../src/roster_window.py:2815
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
@@ -9128,48 +9269,48 @@ msgstr ""
 "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
 "później."
 
-#: ../src/roster_window.py:285 ../src/roster_window.py:939
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1892
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:1904
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako rozłączonego."
 
-#: ../src/roster_window.py:1930
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:2130 ../src/roster_window.py:3299
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2131 ../src/roster_window.py:3300
+#: ../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?"
@@ -9177,15 +9318,28 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2157
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2298 ../src/roster_window.py:2535
+#: ../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 "Czy jesteś pewien, że chcesz opuścić pokój \"%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 "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2299
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9193,16 +9347,16 @@ msgstr ""
 "Wiadomości będą dostępne do odczytania ich później, tylko wtedy, gdy masz "
 "włączoną obsługę historii."
 
-#: ../src/roster_window.py:2536
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2539
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2540
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9210,11 +9364,11 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:2543
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2548
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9224,57 +9378,57 @@ msgstr ""
 "następujących transportów: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2679
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2687
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2688
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Czy chcesz usunąć z rostera grupę %s?"
 
-#: ../src/roster_window.py:2747
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Usuń z rostera wszystkie kontakty należące do tej grupy"
 
-#: ../src/roster_window.py:2786
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2787
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" zostanie usunięty z Twojej listy kontaktów"
 
-#: ../src/roster_window.py:3139
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9283,11 +9437,11 @@ msgstr ""
 "będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3150
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3153
+#: ../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."
@@ -9295,16 +9449,16 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3160
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3165
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9314,19 +9468,19 @@ msgstr ""
 "cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
 "jako rozłączony."
 
-#: ../src/roster_window.py:3221
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Aby rozmawiać z innymi osobami musisz założyć konto Jabbera."
 
-#: ../src/roster_window.py:3774
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3776
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9334,12 +9488,12 @@ msgstr ""
 "Twój serwer uniemożliwia przechowywanie metakontaktów. Informacja ta nie "
 "zostanie przywrócona podczas następnego połączenia."
 
-#: ../src/roster_window.py:3861
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3863
+#: ../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 "
@@ -9349,11 +9503,11 @@ msgstr ""
 "rostera. Używa się ich przede wszystkim wtedy, gdy jedna osoba ma kilka kont "
 "Jabbera lub zarejestrowana jest w kilku transportach."
 
-#: ../src/roster_window.py:3976
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:3987
+#: ../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:"
@@ -9361,120 +9515,130 @@ msgstr[0] "Czy chcesz wysłać ten plik do %s:"
 msgstr[1] "Czy chcesz wysłać te pliki do %s:"
 msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Wyślij %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Przekształć %s oraz %s w metakontakty"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4664 ../src/roster_window.py:4735
-#: ../src/roster_window.py:4744 ../src/systray.py:216 ../src/systray.py:263
+#: ../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 "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:4751
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4756
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4793 ../src/systray.py:279
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4813
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4853
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4915 ../src/roster_window.py:5016
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:4942
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:4950
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
 #. Send Group Message
-#: ../src/roster_window.py:5112 ../src/roster_window.py:5638
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5120
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5124
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
-#: ../src/roster_window.py:5535
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
 #. Send single message
-#: ../src/roster_window.py:5719
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5775
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5783
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
-#: ../src/roster_window.py:5857
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5864
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
-#: ../src/roster_window.py:5944
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
 #. History manager
-#: ../src/roster_window.py:6057
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:6066
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:6276
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
@@ -9495,16 +9659,16 @@ msgstr "Brak wyników"
 msgid "Disk WriteError"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:411 ../src/session.py:446
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
-#: ../src/session.py:413
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9520,7 +9684,7 @@ msgstr ""
 "\n"
 "\t\tCzy akceptujesz te ustawienia?"
 
-#: ../src/session.py:447
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9652,28 +9816,28 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#: ../src/vcard.py:241
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:243
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:264
+#: ../src/vcard.py:268
 msgid "?Time:Unknown"
 msgstr "?Czas: Nieznany"
 
-#: ../src/vcard.py:288 ../src/vcard.py:298 ../src/vcard.py:514
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:327
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9681,7 +9845,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:337
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9689,12 +9853,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
 #. None
-#: ../src/vcard.py:341
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9702,18 +9866,36 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: ../src/vcard.py:355 ../src/vcard.py:410 ../src/vcard.py:539
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
+#~ msgid "B_OSH Port:"
+#~ msgstr "B_OSH Port:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Pokaż _listę kontaktów"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#~ msgid "Custom"
+#~ msgstr "Własne"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
+
+#~ msgid "Generic"
+#~ msgstr "Ogólne"
+
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
@@ -10195,9 +10377,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "_Uaktywnij przesyłanie wiadomości do adresów link-local"
 
-#~ msgid "_Modify"
-#~ msgstr "_Edytuj"
-
 #~ msgid "_Blocked Contacts"
 #~ msgstr "_Kontakty zablokowane"
 
@@ -10328,9 +10507,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Usuń %s z grupy %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Przekształć %s oraz %s w metakontakty"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
 
@@ -10442,9 +10618,6 @@ msgstr " zasób o wysokim priorytecie "
 #~ "jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma "
 #~ "wartość True)"
 
-#~ msgid "Add"
-#~ msgstr "Dodaj"
-
 #~ msgid "Away "
 #~ msgstr "Zaraz wracam "
 
diff --git a/po/pt.po b/po/pt.po
index 2ca27bac5..72dc91a7f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -37,7 +37,7 @@ msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
@@ -61,7 +61,7 @@ msgid "_Personal Events"
 msgstr "Detalhes Pessoais..."
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "_Iniciar Conversa"
@@ -96,61 +96,59 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Clique para ver os serviços (tais como transportes MSN e ICQ) dos servidores "
-"jabber"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usar autenticação"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Ligar quando eu premir Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Já tenho uma conta e quero usá-la"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Gerir..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Recursos dos Servidores"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 #, fuzzy
 msgid "Set my profile when I connect"
@@ -158,7 +156,6 @@ msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
@@ -171,31 +168,32 @@ msgstr ""
 "à rede Jabber."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "O seu JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nome do Host:"
 
+#: ../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:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Senha:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Porta:"
 
@@ -203,11 +201,6 @@ msgstr "_Porta:"
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "Nome de _utilizador"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -216,18 +209,16 @@ msgstr "<b>Diversos</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Detalhes Pessoais</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Conta"
 
@@ -236,25 +227,24 @@ msgid "Account Modification"
 msgstr "Modificação da Conta"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "_Administrador"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Religar automaticamente em caso de perda de ligação."
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Ligar ao arranque"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "Mu_dar Senha"
 
@@ -271,37 +261,35 @@ msgstr ""
 "esta opção marcada o TLS será desactivado."
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "_Escolha chave..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Ligação"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -309,17 +297,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Geral"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Nome do Host:"
 
@@ -341,7 +326,6 @@ msgstr ""
 "ligação, os quais resultam na perda dessa ligação"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -351,7 +335,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -361,7 +344,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -376,43 +358,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "Nenhum"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Detalhes Pessoais..."
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Porta:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -423,7 +407,7 @@ msgstr ""
 "conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
@@ -432,13 +416,13 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Re_curso: "
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -453,30 +437,25 @@ msgstr ""
 "prioridade receberá os eventos. (ver em baixo)"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar _frase de acesso (inseguro)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -487,22 +466,17 @@ msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (específica)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 #, fuzzy
 msgid "Use file transfer proxies"
 msgstr "lista de transferências de ficheiros"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr ""
 
-#: ../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:13
 #, fuzzy
 msgid "_Name:"
 msgstr "_Nome: "
@@ -512,31 +486,38 @@ msgstr "_Nome: "
 msgid "<b>Proxy</b>"
 msgstr "<b>Registos</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Pedir para ver o estado dele/dela"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usar autenticação"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Ligar ao arranque"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 #, fuzzy
 msgid "First Name:"
 msgstr "Nome:"
@@ -547,7 +528,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -555,59 +535,98 @@ msgid ""
 msgstr ""
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 #, fuzzy
 msgid "Last Name:"
 msgstr "Nome:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 #, fuzzy
 msgid "Mer_ge accounts"
 msgstr "_Fundir contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Enviar pacotes keep-alive"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinc_ronizar estado da conta com estado global"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:52
 #, fuzzy
-msgid "Use custom port:"
+msgid "Use cust_om hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
+msgstr "Usar hostname/porta personalizados"
+
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Editar Detalhes Pessoais..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Activar"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Nome do Host:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Gerir..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Porta:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 #, fuzzy
 msgid "A_ccount:"
@@ -809,7 +828,7 @@ msgid "All statuses"
 msgstr "Estado: "
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Ausente"
 
@@ -827,7 +846,7 @@ msgid "Have "
 msgstr ""
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -837,7 +856,7 @@ msgid "Launch a command"
 msgstr "comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Indisponível"
 
@@ -956,7 +975,7 @@ msgstr "Nome:"
 msgid "New entry received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../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 ""
 
@@ -1005,12 +1024,22 @@ msgstr "Introduza a nova senha:"
 msgid "<b>Type your new status message</b>"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "Activo"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "Sala:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 #, fuzzy
 msgid "Preset messages:"
 msgstr "mensagem de estado:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Guardar Ficheiro como..."
@@ -1074,11 +1103,11 @@ msgstr "_Adicionar à Lista"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1197,7 +1226,7 @@ msgstr ""
 "Quando uma transferência de ficheiro é concluida, exibir um popup de "
 "notificação"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1234,7 +1263,7 @@ msgstr ""
 "Contacto\n"
 "Banner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1255,12 +1284,12 @@ msgstr "Personalização de Temas do Gajim"
 msgid "Gone"
 msgstr "Nenhum"
 
-#: ../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
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1308,7 +1337,7 @@ msgstr "Muda A_ssunto"
 msgid "Configure _Room..."
 msgstr "Configurar _Sala"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "Adicionar esta Sala aos _Bookmarks"
@@ -1343,23 +1372,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Dono"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "E_nviar Mensagem Privada"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1367,13 +1410,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
@@ -1389,7 +1432,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:4
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
+#: ../src/dialogs.py:2908
 #, fuzzy
 msgid "Delete"
 msgstr "Apagar MOTD"
@@ -1416,7 +1460,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "_Pesquisar"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
@@ -1437,7 +1481,7 @@ msgstr "_Pesquisar"
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
@@ -1465,8 +1509,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Entrar"
 
@@ -1495,7 +1539,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1530,32 +1574,50 @@ msgstr "<b>Definições</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "Ligação HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Nome:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Senha:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Tipo:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proxy:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Usar autenticação"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Porta:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "_Usar proxy"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Usar autenticação"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "Nome de _utilizador"
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1595,17 +1657,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "E_nviar"
 
@@ -1713,10 +1780,14 @@ msgstr ""
 "invisível"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1730,20 +1801,20 @@ msgstr ""
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1752,36 +1823,36 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1791,7 +1862,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1801,7 +1872,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1809,37 +1880,37 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -1848,7 +1919,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -1857,7 +1928,7 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1865,7 +1936,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1873,7 +1944,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1881,14 +1952,14 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1899,20 +1970,20 @@ msgstr ""
 "spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
 "de qualquer contacto que não estiver na sua lista."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1922,13 +1993,13 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -1937,221 +2008,237 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificação da Conta"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Mostrar apenas na _lista"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "Interrompida"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Gerir Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 #, fuzzy
 msgid "_Outgoing message:"
 msgstr "Mensagem a enviar:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "_Entrar num Chat"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "Fora da lista"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minutos"
 
@@ -2204,7 +2291,7 @@ msgstr "Jabber ID:"
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr ""
 
@@ -2275,127 +2362,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Complemento:"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Família:"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Página pessoal:"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Formato de uma linha</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Alcunha:"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefone:"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Sons</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Código Postal:"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Propriedades</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Registos</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Definições</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Definições</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sons</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "Sobre"
 
@@ -2405,18 +2492,18 @@ msgstr ""
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 #, fuzzy
 msgid "Personal Info"
 msgstr "Detalhes Pessoais..."
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Trabalho"
 
@@ -2434,8 +2521,8 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "_Remover"
 
@@ -2461,14 +2548,14 @@ msgstr "Editar _Grupos"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr ""
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr ""
 
@@ -2479,7 +2566,7 @@ msgstr "_Remover"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Pedir para ver o estado dele/dela"
@@ -2508,12 +2595,6 @@ msgstr "Iniciar _Conversa"
 msgid "_Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 #, fuzzy
 msgid "_Forbid him/her to see my status"
@@ -2538,17 +2619,34 @@ msgstr "_Renomear"
 msgid "_Subscription"
 msgstr "_Subscrição"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "_Continuar"
 
+#: ../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 "Apagar MOTD"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+msgid "gtk-ok"
+msgstr ""
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2578,59 +2676,64 @@ msgstr "Perfil, Avatar"
 
 #: ../data/glade/roster_window.glade.h:9
 #, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Mostrar Contactos _Offline"
+
+#: ../data/glade/roster_window.glade.h:10
+#, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transportes"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "Contas"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 #, fuzzy
 msgid "_View"
 msgstr "_Voz"
@@ -2653,12 +2756,12 @@ msgid "_Add contact"
 msgstr "Adicionar _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Pesquisar"
 
@@ -2749,10 +2852,6 @@ msgstr "Pedido de Subscrição"
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2779,10 +2878,6 @@ msgstr "Enviar _Mensagem Simples"
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Mostrar _Lista de Contactos"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Es_tado"
@@ -2802,57 +2897,62 @@ msgstr "<b>Aplicações</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Definições</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Definições</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 #, fuzzy
 msgid "Comments"
 msgstr "Comentário: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Configurar _Sala"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contacto:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Informações do Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Mais"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "_Escolher Avatar"
@@ -2865,6 +2965,11 @@ msgstr "<b>Tráfego Jabber</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Activar"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2894,13 +2999,13 @@ msgstr "Atribuir chave OpenPGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Renomear"
 
@@ -2925,31 +3030,26 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-#, fuzzy
-msgid "Modify Account"
-msgstr "_Modificar Conta..."
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informações do Contacto"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2977,7 +3077,7 @@ msgstr "Neste grupo"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr ""
 
@@ -3002,232 +3102,269 @@ msgstr "(Nenhum)"
 msgid "Hidden"
 msgstr "Escondida"
 
+#: ../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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "German"
 msgstr "Geral"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Greek"
 msgstr "green"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Croatian"
 msgstr "Morada"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Italian"
 msgstr "Itálico"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Polish"
 msgstr "_Publicar"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "Geral"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr ""
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "Sublinhar"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "Serviço"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "Letra:"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "Informações do Contacto"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encriptação activada"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "Fora da lista"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Uma lista de transferências de ficheiros activas, completas e paradas"
+
+#: ../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
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, fuzzy, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
@@ -3235,33 +3372,33 @@ msgstr "Usar autenticação"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, fuzzy, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3270,66 +3407,66 @@ msgstr ""
 "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 "pessoa. (Por exemplo, /%s explode.)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, fuzzy, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Não há informações de ajuda para /%s"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3337,254 +3474,266 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 irá agora sair"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "Informações do Contacto"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "Contacto Saiu"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "_Continuar"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrição"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Chat"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s na sala %(room_name)s enviou-lhe uma nova mensagem."
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Neste grupo"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Já está na sala %s"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - %d mensagem não lida"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 #, fuzzy
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Ausente."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo, em minutos, após o qual o seu estado muda para Indisponível."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr ""
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr ""
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
 "'never' - never print time."
 msgstr ""
 
-#: ../src/common/config.py:121
+#: ../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:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se Verdadeiro (True), não remover */_ . Para que *abc* fique em negrito "
 "(bold) mas * * não seja removido."
 
-#: ../src/common/config.py:128
+#: ../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:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:138
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3592,12 +3741,12 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Número de minutos que as últimas linhas da conversa anterior devem durar."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3605,11 +3754,11 @@ msgstr ""
 "Enviar mensagem ao premir Ctrl+Enter e fazer nova linha com Enter "
 "(Comportamento por defeito do cliente ICQ Mirabilis)."
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Número de linhas a guardar ao premir Ctrl+TeclaCIMA."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3618,11 +3767,11 @@ msgstr ""
 "Ou um endereço URL personalizado contendo %s, onde %s é a palavra ou frase, "
 "ou 'WIKTIONARY', que significa que será usado o Wiktionary."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Se marcado, Gajim pode ser controlado à distância usando gajim-remote."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3630,42 +3779,48 @@ msgid ""
 "connection."
 msgstr ""
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:182
+#: ../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:184
+#: ../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:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:190
+#: ../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, "
@@ -3674,34 +3829,28 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "O standart IEC diz: KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr ""
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3709,12 +3858,12 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
@@ -3722,7 +3871,7 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3730,13 +3879,13 @@ msgstr ""
 "Se Verdadeiro (True), sai do Gajim quando o botão X do Window Manager for "
 "clicado. Esta definição só será aplicada se o trayicon estiver a ser usado."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Se Verdadeiro (True), Gajim registará para xmpp:// a cada arranque."
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3744,7 +3893,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim mostrará um ícone em cada aba contendo mensagens "
 "não lidas. Dependendo do tema, este ícone poderá ser animado."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3753,11 +3902,11 @@ msgstr ""
 "Se Verdadeiro (True), Gajim exibirá a mensagem de estado, caso houver, de "
 "cada contacto debaixo do nome de cada um deles na lista"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
@@ -3765,7 +3914,7 @@ msgstr ""
 "Se Verdadeiro (True), Gajim perguntará por um avatar a cada contacto que não "
 "tinha um da última vez ou tenha um na memória cache há demasiado tempo."
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3774,7 +3923,7 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: ../src/common/config.py:230
+#: ../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 "
@@ -3783,35 +3932,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../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 "
 "pending events."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3819,7 +3968,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3831,49 +3980,49 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:250
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3882,268 +4031,294 @@ msgstr ""
 "Uma lista de palavras separadas por ponto-e-vírgula e que serão sublinhadas "
 "num chat de vários utilizadores."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../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:256
+#: ../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:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../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 separately)"
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"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:278
+#: ../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:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 ""
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4152,151 +4327,181 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy
 msgid "Wrong host"
 msgstr "Frase de acesso"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informação de registo para o transport %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Publicação vCard deu-se com sucesso"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Publicação vCard falhou"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "Jabber ID Inválido"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcunha não encontrada: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Não está na lista de membros."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorização foi removida"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../src/common/connection_handlers.py:2580
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4307,275 +4512,285 @@ msgstr ""
 "org/ para o remover."
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Palavra-chave do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "O utilizador será ligado a %s sem OpenPGP."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "Ligação"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Guardado em: %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "Ligação"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique se o seu login e senha estão correctos."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "erro ao enviar"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "Não é possível enviar ficheiros vazios"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4584,20 +4799,31 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Contacto:"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "Transportes"
 
@@ -4607,11 +4833,11 @@ msgid "Not in roster"
 msgstr "Fora da lista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Bindings do python D-Bus estão em falta neste computador"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
@@ -4640,1656 +4866,1612 @@ msgid ""
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr ""
+
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "one"
 msgstr "Nenhum"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "three"
 msgstr "Rua:"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 #, fuzzy
 msgid "four"
 msgstr "Porta:"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "five"
 msgstr "Ficheiro"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "seven"
 msgstr "Evento"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 #, fuzzy
 msgid "nine"
 msgstr "_Continuar"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 #, fuzzy
 msgid "eleven"
 msgstr "Apagar MOTD"
 
+#. 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 ""
-
-#. 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"
+msgid "%(0)s o'clock"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:44
+#, fuzzy
+msgid "five past %(0)s"
+msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
+#: ../src/common/fuzzyclock.py:44
 #, fuzzy
-msgid "ten past $0"
+msgid "ten past %(0)s"
 msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "quarter past %(0)s"
+msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "twenty past %(0)s"
+msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr ""
+#: ../src/common/fuzzyclock.py:45
+#, fuzzy
+msgid "twenty five past %(0)s"
+msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
+#: ../src/common/fuzzyclock.py:46
 #, fuzzy
-msgid "twenty five to $1"
+msgid "twenty five to %(1)s"
 msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:46
 #, fuzzy
-msgid "twenty to $1"
+msgid "twenty to %(1)s"
 msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "quarter to $1"
+msgid "quarter to %(1)s"
 msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "ten to $1"
+msgid "ten to %(1)s"
 msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
+#: ../src/common/fuzzyclock.py:47
 #, fuzzy
-msgid "five to $1"
+msgid "five to %(1)s"
 msgstr "Registar para %s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 #, fuzzy
 msgid "Morning"
 msgstr "A trabalhar"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 #, fuzzy
 msgid "Noon"
 msgstr "Nenhum"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 #, fuzzy
 msgid "Evening"
 msgstr "Evento"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr ""
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "está a escrever uma mensagem..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar mensagem"
 msgstr[1] "Enviar mensagem"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/passwords.py:92
+#: ../src/common/passwords.py:123
 #, fuzzy, python-format
-msgid "Gajim account %s"
+msgid "XMPP account %s@%s"
 msgstr "para conta %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "Pausada"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "Negrito"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr ""
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "Conversa"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "Negrito"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "_Conteúdo"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "Completa"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "_Conteúdo"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "Activo"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 #, fuzzy
 msgid "Curious"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "Apagar MOTD"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr ""
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr ""
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr ""
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 #, fuzzy
 msgid "Envious"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "mensagem"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "Invisível"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "Nenhum"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "_Host:"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "Geral"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "_Modificar"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 #, fuzzy
 msgid "Nervous"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "Offline"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "Grupo"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "Apagar MOTD"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "Interrompida"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "Nome:"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 #, fuzzy
 msgid "Serious"
 msgstr "_Anterior"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "_Expulsar"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "A dormir"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "Rua:"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "Subscrição"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "Tempo"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "Sublinhar"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Frase de acesso"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "Evento"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "Neste grupo"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Evento"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Expulsando %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "_Entrar"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "A comer"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "Mudar Assunto"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Expulsando %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Relaxing"
 msgstr "simples"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Expulsando %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "A comer"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "_Desligar"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "A comer"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "A comer"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr ""
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "A dormir"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "A comer"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "Estou a ver um filme."
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "A comer"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "Estou ao telefone."
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "A transferir"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "Ligando"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr ""
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "Ligação"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "A trabalhar"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
 msgstr ""
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr ""
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Para continuar a enviar e receber mensagens, precisará de se reconectar."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
 "Link-local messaging might not work properly."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, fuzzy, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, fuzzy, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr ""
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "A sua mensagem não pode ser enviada enquanto não estiver ligado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, fuzzy, python-format
 msgid "Error while adding service. %s"
 msgstr "erro ao enviar"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr ""
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Activo"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "Evento"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>Definições Personalizadas</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 msgstr ""
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr ""
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "Nova Mensagem"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "Nova Mensagem"
-
-#: ../src/config.py:1057
-#, fuzzy
-msgid "Contact Connected"
-msgstr "Nome do Contacto"
-
-#: ../src/config.py:1058
-#, fuzzy
-msgid "Contact Disconnected"
-msgstr "Contacto Entrou"
-
-#: ../src/config.py:1059
-#, fuzzy
-msgid "Message Sent"
-msgstr "Mensagem"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr ""
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr ""
-
-#: ../src/config.py:1062
-#, fuzzy
-msgid "GMail Email Received"
-msgstr "Convite Recebido"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "Nome"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 #, fuzzy
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "Gerir Contas"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Jabber ID Inválido"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Não está ligado ao servidor"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Sem ligação, não lhe é possível editar as suas informações pessoais."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2461
+#: ../src/config.py:2500
 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 ""
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, verifique se preencheu os campos servidor e sala ou remova este "
 "bookmark"
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Alcunha não encontrada: %s"
 
-#: ../src/config.py:3100
+#: ../src/config.py:2965 ../src/config.py:3213
 #, fuzzy
-msgid "Duplicate Jabber ID"
-msgstr "Jabber ID Inválido"
+msgid "Invalid server"
+msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3101
+#: ../src/config.py:2979
 #, fuzzy
-msgid "This account is already configured in Gajim."
-msgstr "Este contacto já se encontra na sua lista de contactos."
+msgid "Invalid room"
+msgstr "Entrada inválida"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6300,27 +6482,34 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "A sua nova conta foi criada com sucesso"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6330,7 +6519,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6338,31 +6527,77 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "A sua nova conta foi criada com sucesso"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Activo"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "Evento"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr ""
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "Nova Mensagem"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "Nova Mensagem"
+
+#: ../src/config.py:3661
+#, fuzzy
+msgid "Contact Connected"
+msgstr "Nome do Contacto"
+
+#: ../src/config.py:3662
+#, fuzzy
+msgid "Contact Disconnected"
+msgstr "Contacto Entrou"
+
+#: ../src/config.py:3663
+#, fuzzy
+msgid "Message Sent"
+msgstr "Mensagem"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr ""
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr ""
+
+#: ../src/config.py:3666
+#, fuzzy
+msgid "GMail Email Received"
+msgstr "Convite Recebido"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6371,75 +6606,75 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Sair"
+
+#: ../src/conversation_textview.py:709
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr ""
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Cliente de IM Jabber"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6454,152 +6689,152 @@ msgstr "Nome do Contacto <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Nome do Contacto"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "Definir MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensagem de Estado de %s"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "Mensagem de Estado"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 #, fuzzy
 msgid "Save as Preset Status Message"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 #, fuzzy
 msgid "Please type a name for this status message"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 #, fuzzy
 msgid "AIM Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr ""
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr ""
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 #, fuzzy
 msgid "MSN Address:"
 msgstr "_Endereço:"
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 #, fuzzy
 msgid "Yahoo! Address:"
 msgstr "Complemento:"
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor preencha os dados do contacto que deseja adicionar na conta %s"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6608,94 +6843,94 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "Alcunha não encontrada: %s"
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Pedido de subscrição para a conta %s por parte de %s"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "Alcunha não encontrada: %s"
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Não pode entrar num chat sem estar ligado."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:1955
+#: ../src/dialogs.py:2180
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6705,286 +6940,312 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "De %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:2568
+#. 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 "Gostaria de o adicionar à minha lista de contactos."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Endereço"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "_Modificar"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupo"
+
+#. 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 "Eu gostaria de o adicionar à minha lista"
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Deve indicar uma palavra-passe à qual a nova conta será associada"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr ""
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6992,38 +7253,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7033,58 +7294,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -7092,317 +7353,341 @@ msgstr ""
 "Não há serviço/recurso no endereço que introduziu, ou pelo menos não "
 "responde. Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço/recurso não contém itens para explorar."
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém quaisquer itens para explorar"
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "comando"
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Bookmark já está configurado"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, fuzzy, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Sala \"%s\" já existe nos seus bookmarks."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark foi adicionado com sucesso"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
+
+#: ../src/disco.py:1863
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Comandos: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "Encriptação OpenPGP"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "Mensagem recebida:"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "_Histórico"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "Mensagem"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "As senhas não conferem"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Modificação da Conta"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr ""
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "Pedir para ver o estado dele/dela"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "Mensagem recebida:"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "Geral"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "Recursos dos Servidores"
@@ -7432,7 +7717,7 @@ msgstr "Tamanho: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Você"
 
@@ -7442,7 +7727,7 @@ msgid "Sender: %s"
 msgstr "Remetente: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -7476,27 +7761,27 @@ msgstr "Introduza a sua mensagem :"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Transferência de ficheiro parada pelo contacto na outra ponta"
+msgid "File transfer stopped"
+msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
@@ -7516,34 +7801,34 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr ""
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 #, fuzzy
 msgid "What do you want to do?"
 msgstr "<b>O que pretende fazer?</b>"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -7579,55 +7864,55 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Falta suporte libglade para o runtime GTK+"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7636,7 +7921,7 @@ msgstr ""
 "Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
 "de %s"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -7644,16 +7929,16 @@ msgstr ""
 "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7661,36 +7946,45 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr ""
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza a chave GPG para a conta %s"
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "O utilizador será ligado a %s sem OpenPGP."
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7700,148 +7994,185 @@ msgstr ""
 "A alcunha que deseja encontra-se em uso ou registado por outro ocupante.\n"
 "Por favor, introduza outra alcunha em baixo:"
 
-#: ../src/gajim.py:571
+#: ../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 "Aceita este pedido?"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Introduza a sua mensagem :"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Pedido de Subscrição"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contacto \"%s\" autorizou-o a ver o seu estado."
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Subscrever"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 está agora %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "É necessária uma palavra-passe para esta sala."
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
+#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
+#: ../src/roster_window.py:3906
+#, fuzzy
+msgid "Do _not ask me again"
+msgstr "_Não voltar a perguntar"
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, fuzzy, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Tem mensagens não lidas"
 msgstr[1] "Tem mensagens não lidas"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7851,84 +8182,94 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Remove o contacto da lista"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro na leitura do ficheiro:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Por favor preencha os dados para a sua nova conta</b>"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 #, fuzzy
 msgid "Error."
 msgstr "Erro:"
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7936,133 +8277,110 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Ligação"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "_Não voltar a perguntar"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 #, fuzzy
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "Bookmark já está configurado"
-
-#: ../src/gajim.py:3001
-#, fuzzy, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Sala \"%s\" já existe nos seus bookmarks."
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark foi adicionado com sucesso"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Pode gerir os seus bookmarks pelo menu de Acções na sua janela."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 #, fuzzy
 msgid "Shows a help on specific command"
 msgstr "Exibe ajuda acerca de um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostrar ajuda sobre comando"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Abre uma janela com a próxima mensagem não lida"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
@@ -8071,49 +8389,50 @@ msgstr ""
 "Mostra uma lista de todos os contactos na lista. Cada contacto aparece numa "
 "linha separada"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "conta"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostrar apenas contactos da conta indicada"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Mostra uma lista de contas registadas"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Muda o estado de uma ou várias contas"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "estado"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "mensagem"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "mensagem de estado:"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -8122,21 +8441,25 @@ msgstr ""
 "estado de todas as contas que têm a opção \"sincronizar com estado global\" "
 "activada"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr ""
 "Mostra uma caixa de conversa para que possa enviar mensagens a um contacto"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contacto com quem deseja conversar"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "se especificado, o contacto é escolhido da lista de contactos desta conta"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 #, fuzzy
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8147,29 +8470,29 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "chave pgp"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "se especificado, a mensagem será encriptada usando esta chave pública"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 #, fuzzy
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
@@ -8180,119 +8503,119 @@ msgstr ""
 "conta são opcionais. Se quiser definir apenas 'conta', sem 'chave OpenPGP', "
 "basta definir 'chave OpenPGP' para ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "subject"
 msgstr "Assunto:"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 #, fuzzy
 msgid "message subject"
 msgstr "Mensagem"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "JID do destinatário da mensagem"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID do contacto"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 #, fuzzy
 msgid "Gets detailed info on a account"
 msgstr "Busca informações detalhadas sobre um contacto"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 #, fuzzy
 msgid "Name of the account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "Ficheiro"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Localização do ficheiro"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "se especificado, a mensagem será enviada usadando esta conta"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Exibe todas as preferências e os seus valores"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Define o valor de 'chave' para 'valor'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "chave=valor"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'chave' é o nome da preferência, 'valor' é o valor da qual se pretende "
 "definir"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Apaga um item das preferências"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "chave"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "nome da preferência a apagar"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr ""
 "Escreve o estado actual das preferências do Gajim para o ficheiro .config"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Adiciona o contacto à lista"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr ""
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 #, fuzzy
 msgid "Adds new contact to this account"
 msgstr "Adiciona um novo contacto nesta conta."
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 #, fuzzy
 msgid ""
 "Returns current status message (the global one unless account is specified)"
@@ -8300,104 +8623,109 @@ msgstr ""
 "Indica o estado actual (o estado global, a não ser que uma conta seja "
 "especificada)."
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr ""
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 #, fuzzy
 msgid "Starts chat, using this account"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr ""
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 #, fuzzy
 msgid "XML to send"
 msgstr "Consola XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr ""
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "conteúdo da mensagem"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Juntar-se a uma Nova Sala"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "_Expulsar"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "As senhas não conferem"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8406,31 +8734,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8439,7 +8767,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8448,7 +8776,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8457,7 +8785,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Frase de acesso"
@@ -8476,178 +8804,181 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Não pode apagar o seu tema actual"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s foi expulso por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "Nome de utilizador inválido"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 #, fuzzy
 msgid "This group chat has no subject"
 msgstr "Esta sala não tem assunto"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Alcunha não encontrada: %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 ""
 "Uso: /%s <alcunha|JID> [razão], bane o JID da sala. A alcunha de um ocupante "
 "pode ser substituida, mas não se conter \"@\". Se o JID estiver neste "
 "momento na sala, este será também expulso. Não suporta espaços numa alcunha."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8656,7 +8987,7 @@ msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8665,7 +8996,7 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8674,7 +9005,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8683,17 +9014,16 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_control.py:1683
+#: ../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 ""
 "Uso: /%s <alcunha> [razão], remove o ocupante especificado pela alcunha da "
 "sala e opcionalmente exibe uma razão. Não suporta espaços na alcunha."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8702,83 +9032,97 @@ msgstr ""
 "Uso: /%s <alcunha> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante da sala especificado pela alcunha."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, fuzzy, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, fuzzy, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, fuzzy, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], exibe ou actualiza o tópico da sala actual."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <message>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "Uso: /%s <alcunha>, muda a sua alcunha na sala actual."
+
+#: ../src/groupchat_control.py:1900
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Tem a certeza de que deseja sair da sala \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se fechar esta janela, perder-se-á a ligação a esta sala."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8809,86 +9153,86 @@ msgstr "Detalhes"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Erro na interpretação (parsing) do ficheiro:"
 
 #. 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 "Impossível escrever para %s. Session Management não será suportado"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:733
+#: ../src/gtkgui_helpers.py:728
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - Um cliente Jabber GTK+"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Deseja sobre-escrevê-lo?"
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8897,182 +9241,192 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:549
+#: ../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] ""
 msgstr[1] ""
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:585
+#: ../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] ""
 msgstr[1] ""
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversas com %s"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 #, fuzzy
 msgid "Disk Error"
 msgstr "Erro:"
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s está agora %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "O estado é agora: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Não está ligado ao servidor"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/message_window.py:448
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, fuzzy, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr ""
 
-#: ../src/notify.py:273
+#: ../src/notify.py:285
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "Geral"
+msgid "Ignore"
+msgstr "_Continuar"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 #, fuzzy
 msgid "Information received"
 msgstr "Convite Recebido"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "É necessária uma ligação para poder publicar as suas informações de contacto."
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr ""
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr ""
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -9080,52 +9434,46 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
@@ -9133,15 +9481,28 @@ msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "Tem a certeza de que deseja sair das salas \"%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 "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9149,16 +9510,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9167,12 +9528,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9182,55 +9543,60 @@ msgstr ""
 "transport."
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9240,12 +9606,12 @@ msgstr ""
 "sempre como offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/roster_window.py:3141
+#: ../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."
@@ -9253,17 +9619,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9272,185 +9638,186 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:3786
+#: ../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 "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s quer enviar-lhe um ficheiro:"
 msgstr[1] "%s quer enviar-lhe um ficheiro:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Envia um ficheiro a um contacto"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "usando a conta %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "Activo"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "Chat"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
@@ -9467,20 +9834,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, fuzzy, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s\n"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9490,7 +9857,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9500,130 +9867,120 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 #, fuzzy
 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 "Recurso: "
 
-#: ../src/tooltips.py:335
+#: ../src/tooltips.py:334
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Versão %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "Ligação"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto Entrou"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "Sala:"
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "Activo"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Este serviço/recurso ainda não respondeu com informações detalhadas"
 
-#: ../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"
@@ -9639,17 +9996,22 @@ msgstr "?Cliente:Desconhecido"
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Cliente:Desconhecido"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9657,7 +10019,7 @@ msgstr ""
 "Este contacto está interessado/a na suas informações de presença, mas você "
 "não está interessado na dele/a"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9665,32 +10027,86 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Não está interessado na presença do contacto, nem ele/ela está na sua"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Está à espera da resposta do contacto sobre o seu pedido de subscrição"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "Encriptação OpenPGP"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Clique para ver os serviços (tais como transportes MSN e ICQ) dos "
+#~ "servidores jabber"
+
+#~ msgid "Servers Features"
+#~ msgstr "Recursos dos Servidores"
+
+#~ msgid "Your JID:"
+#~ msgstr "O seu JID:"
+
+#~ msgid "Name:"
+#~ msgstr "Nome:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host:"
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "Mostrar _Lista de Contactos"
+
+#, fuzzy
+#~ msgid "Modify Account"
+#~ msgstr "_Modificar Conta..."
+
+#, fuzzy
+#~ msgid "Gajim account %s"
+#~ msgstr "para conta %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>Definições Personalizadas</b>"
+
+#, fuzzy
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Jabber ID Inválido"
+
+#, fuzzy
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Este contacto já se encontra na sua lista de contactos."
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Transferência de ficheiro parada pelo contacto na outra ponta"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "Geral"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "Activo"
 
 #, fuzzy
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
@@ -9722,9 +10138,6 @@ msgstr " recurso com prioridade "
 #~ msgid "_Retype Password:"
 #~ msgstr "_Senha:"
 
-#~ msgid "_Use proxy"
-#~ msgstr "_Usar proxy"
-
 #~ msgid ""
 #~ "If you have 2 or more accounts and it is checked, Gajim will list all "
 #~ "contacts as if you had one account"
@@ -9863,10 +10276,6 @@ msgstr " recurso com prioridade "
 #~ msgid "_Before time:"
 #~ msgstr "Antes da hora:"
 
-#, fuzzy
-#~ msgid "_Font:"
-#~ msgstr "Letra:"
-
 #~ msgid "_Never"
 #~ msgstr "_Nunca"
 
@@ -10017,10 +10426,6 @@ msgstr " recurso com prioridade "
 #~ msgstr "De %s na sala %s"
 
 #, fuzzy
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Envia um ficheiro a um contacto"
-
-#, fuzzy
 #~ msgid "Affiliation:"
 #~ msgstr "Filiação: "
 
@@ -10077,10 +10482,6 @@ msgstr " recurso com prioridade "
 #~ "notify_on_all_muc_messages estiver definido como Verdadeiro)"
 
 #, fuzzy
-#~ msgid "Add"
-#~ msgstr "Endereço"
-
-#, fuzzy
 #~ msgid "Away "
 #~ msgstr "Ausente"
 
@@ -10106,9 +10507,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Invalid room or server name"
 #~ msgstr "Nome de utilizador inválido"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr "Publicação vCard deu-se com sucesso"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "As suas informações pessoais foram publicadas com sucesso."
 
@@ -10168,10 +10566,6 @@ msgstr " recurso com prioridade "
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s enviou-lhe uma nova mensagem."
 
-#, fuzzy
-#~ msgid "GUI Migration failed"
-#~ msgstr "Publicação vCard falhou"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "A migração dos registos de conversas (logs) deu-se com sucesso."
 
@@ -10230,9 +10624,6 @@ msgstr " recurso com prioridade "
 #~ msgid "account: "
 #~ msgstr "conta: "
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "Se fechar esta janela, perder-se-á a ligação a estas salas."
 
@@ -10371,9 +10762,6 @@ msgstr " recurso com prioridade "
 #~ "Pode configurar opções avançadas em \"Editar->Contas\" na janela "
 #~ "principal. "
 
-#~ msgid "Service"
-#~ msgstr "Serviço"
-
 #~ msgid ""
 #~ "Your new account has been created and added to your gajim configuration.\n"
 #~ "You can set advanced account options using \"Edit->Accounts\" in the main "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 816280f39..373c89645 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,17 +7,12 @@
 # Gajim <gajim-devel@gajim.org>, 2007.
 # Djavan Fagundes <dnoway@gmail.com>, 2009.
 #
-#. app_name (string)
-#. replaces_id (uint)
-#. event_id (string)
-#. app_icon (string)
-#: ../src/notify.py:563
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-16 14:29+0200\n"
-"PO-Revision-Date: 2009-04-03 15:49-0300\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:00+0200\n"
 "Last-Translator: Djavan Fagundes <dnoway@gmail.com>\n"
 "Language-Team: Português Brasileiro <gajim-devel@gajim.org>\n"
 "MIME-Version: 1.0\n"
@@ -115,52 +110,57 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Usar autenticação"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu clicar em Fim"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente de configuração de conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Eu já tenho uma conta e quero _usá-la"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../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 "Se marcado, o Gajim lembrará a senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Gerenciar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Salvar sen_ha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Configurar perfil quando eu conectar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Usa nome de máquina/porta customizados"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../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."
@@ -168,36 +168,36 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../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 "_Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Nome do computador:"
 
-#: ../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:57
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../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 "_Senha:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Servidor:"
 
@@ -232,17 +232,17 @@ msgid "Administration operations"
 msgstr "Operações de administração"
 
 #: ../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 "Reconectar automaticamente quando a conexão cair"
 
 #: ../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 "C_onectar na inicialização do 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 "A_lterar senha"
 
@@ -259,23 +259,23 @@ msgstr ""
 "TLS será desabilitado"
 
 #: ../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 "_Escolha a chave..."
 
 #: ../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 "Clique para mudar a senha da conta"
 
 #: ../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 ""
 "Clique para requisitar autorização para todos os contatos de outra conta"
 
 #: ../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 "Conexão"
 
@@ -285,10 +285,10 @@ msgstr "Editar detalhes pessoais..."
 
 #. 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:1233
-#: ../src/common/helpers.py:1245 ../src/notify.py:559 ../src/notify.py:580
-#: ../src/notify.py:619 ../src/notify.py:631
+#: ../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"
 
@@ -296,10 +296,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:2684
-#: ../src/roster_window.py:5227
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Geral"
 
@@ -308,7 +308,7 @@ msgid "Hostname: "
 msgstr "Nome do computador: "
 
 #: ../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."
@@ -318,7 +318,7 @@ msgstr ""
 "corretamente."
 
 #: ../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"
@@ -335,7 +335,7 @@ msgstr ""
 "'leitura' somente para você"
 
 #: ../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"
@@ -344,7 +344,7 @@ msgstr ""
 "usando esta conta"
 
 #: ../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 "
@@ -354,13 +354,13 @@ msgstr ""
 "mudança no status global (definido pela caixa no fundo da janela da lista)"
 
 #: ../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 "Informações sobre você são gravadas no servidor"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1577
-#: ../src/config.py:2082
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
@@ -370,19 +370,19 @@ msgstr "Nenhuma chave selecionada"
 #. 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:1125
-#: ../src/config.py:1214 ../src/config.py:1482 ../src/config.py:1487
-#: ../src/config.py:1990 ../src/config.py:2068 ../src/config.py:2081
-#: ../src/config.py:3170 ../src/config.py:3238 ../src/dialogs.py:293
+#: ../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:2754 ../src/roster_window.py:2760
-#: ../src/roster_window.py:2765
+#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
+#: ../src/roster_window.py:2800
 msgid "None"
 msgstr "Nenhum"
 
 #: ../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 "Informações pessoais"
@@ -392,12 +392,12 @@ msgid "Port: "
 msgstr "Porta: "
 
 #: ../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 "_Prioridade:"
 
 #: ../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 "
@@ -408,7 +408,7 @@ msgstr ""
 "conta; O cliente com a maior prioridade receberá os eventos"
 
 #: ../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 "A prioridade será alterada automaticamente de acordo com o seu status."
 
@@ -417,12 +417,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../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 "Recur_so:"
 
 #: ../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 "
@@ -441,7 +441,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Salvar _frase de acesso (inseguro)"
 
 #: ../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 "Salvar his_tórico para todos os contatos desta conta"
 
@@ -450,12 +450,12 @@ msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
 #: ../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 "_Sincronizar status da conta com status global"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Sincronizar contatos"
@@ -465,7 +465,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
 
 #: ../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 "Usar proxies de transferência de arquivos"
 
@@ -474,7 +474,7 @@ msgid "_Adjust to status"
 msgstr "_Ajustar para status"
 
 #: ../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 "_Nome:"
 
@@ -491,7 +491,12 @@ msgstr "_Ajustar para status"
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usar autenticação"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -499,26 +504,26 @@ msgstr ""
 "Marcando esta opção, o Gajim irá perguntar você antes de enviar sua senha "
 "através de uma conexão não-segura."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 #, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "C_onectar na inicialização do 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 "Email:"
 
-#: ../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 "Primeiro nome:"
 
-#: ../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 "Se marcado, o Gajim obterá a senha de um agente GPG como o 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"
@@ -528,95 +533,96 @@ msgstr ""
 "pode selecionar outra aqui.\n"
 "Considere a possível modificação das regras do seu firewall."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:780
+#: ../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 "Último nome:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Mes_clar contas"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5178
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 #, fuzzy
 msgid "Send _keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "_Sincronizar status da conta com status global"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 #, fuzzy
 msgid "Use G_PG Agent"
 msgstr "Usar o _Agente GPG"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Usa nome de máquina/porta customizados"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Usar servidor/porta personalizado"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 #, fuzzy
 msgid "_Enable"
 msgstr "Habilitar"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 #, fuzzy
 msgid "_Hostname: "
 msgstr "_Nome do computador:"
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 #, fuzzy
 msgid "_Manage..."
 msgstr "Gerenciar..."
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
 #, fuzzy
 msgid "_Port: "
 msgstr "_Porta:"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "A_visar antes de usar uma conexão não-segura"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 #, fuzzy
 msgid "_use HTTP__PROXY environment variable"
 msgstr "Usar variável de ambiente HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -806,7 +812,7 @@ msgid "All statuses"
 msgstr "Totos os status"
 
 #: ../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 "Afastado"
 
@@ -823,7 +829,7 @@ msgid "Have "
 msgstr "Possui "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Invisível"
 
@@ -832,7 +838,7 @@ msgid "Launch a command"
 msgstr "Executar um comando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Não disponível"
 
@@ -953,7 +959,7 @@ msgstr "Modificado:"
 msgid "New entry received"
 msgstr "Novo evento recebido"
 
-#: ../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 "Você recebeu uma nova entrada:"
 
@@ -1069,11 +1075,11 @@ msgstr "_Adicionar à lista"
 
 #: ../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:5874
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Histórico"
 
@@ -1184,7 +1190,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Mostrar um alerta visual quanto uma transferência de arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1220,7 +1226,7 @@ msgstr ""
 "Linha contato\n"
 "Banner de conversa"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:768
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Negrito"
 
@@ -1244,7 +1250,7 @@ msgstr "Ido"
 msgid "Inactive"
 msgstr "Inativo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:769
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Itálico"
 
@@ -1292,7 +1298,7 @@ msgstr "Alterar as_sunto..."
 msgid "Configure _Room..."
 msgstr "Configurar _sala..."
 
-#: ../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 "Ma_rcadores"
 
@@ -1324,23 +1330,37 @@ msgstr "_Administração"
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../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 "_Bloquear"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "Proprietári_o"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Enviar mensagem privada"
 
-#: ../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 "_Desbloquear"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Voz"
 
@@ -1348,13 +1368,13 @@ msgstr "_Voz"
 msgid "Create new post"
 msgstr "Criar nova postagem"
 
-#: ../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 "De"
 
 #. 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 "Assunto"
 
@@ -1373,7 +1393,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gerenciador de histórico de conversas do Gajim</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 "Deletar"
 
@@ -1426,7 +1447,7 @@ msgstr "Pesquisar:"
 msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1803
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
@@ -1453,8 +1474,8 @@ msgstr "Recentemente:"
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../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 "_Ingressar"
 
@@ -1483,7 +1504,7 @@ msgstr "Minimizar ao entrar automaticamente"
 msgid "Print status:"
 msgstr "Imprimir status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Servidor:"
 
@@ -1513,11 +1534,6 @@ msgstr "<b>Configurações</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
 #, fuzzy
-msgid "B_OSH Port:"
-msgstr "_Porta:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1526,45 +1542,45 @@ msgstr ""
 "Conexão HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Gerenciar perfis de proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 #, fuzzy
 msgid "Use HTTP prox_y"
 msgstr "_Usar proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usar autenticação"
 
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:16
+#: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "Nome de _usuário:"
 
@@ -1616,7 +1632,7 @@ msgstr "Exibir o perfil do contato (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 "_Enviar"
 
@@ -2209,7 +2225,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2688
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Lista de privacidade"
 
@@ -2353,7 +2369,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Prefixo</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:323
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Cargo:</b>"
 
@@ -2413,8 +2429,8 @@ msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5215
-#: ../src/roster_window.py:5693 ../src/roster_window.py:5822
+#: ../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 "_Remover"
 
@@ -2436,14 +2452,14 @@ msgstr "Editar _grupos..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5765
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5133 ../src/roster_window.py:5646
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
@@ -2453,7 +2469,7 @@ msgstr "Remo_ver"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5143 ../src/roster_window.py:5731
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Enviar status perso_nalizado"
 
@@ -2478,12 +2494,6 @@ msgstr "Iniciar _conversa"
 msgid "_Allow him/her to see my status"
 msgstr "_Permitir que ele/ela veja meu status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5206 ../src/roster_window.py:5683
-#: ../src/roster_window.py:5812
-msgid "_Block"
-msgstr "_Bloquear"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Proibir ele/ela de ver meu status"
@@ -2505,16 +2515,34 @@ msgstr "_Renomear..."
 msgid "_Subscription"
 msgstr "_Inscrição"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5200 ../src/roster_window.py:5677
-#: ../src/roster_window.py:5809
-msgid "_Unblock"
-msgstr "_Desbloquear"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "Nã_o ignorar"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Adicionar _contato..."
@@ -2553,8 +2581,9 @@ msgid "Show _Offline Contacts"
 msgstr "Mostrar contatos desc_onectados"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
-msgstr "Exibi_r lista"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
+msgstr "Mostre _lista"
 
 #: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
@@ -2570,7 +2599,7 @@ msgstr "_Ações"
 msgid "_Contents"
 msgstr "Índi_ces"
 
-#: ../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 "_Editar"
 
@@ -2612,11 +2641,11 @@ msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5834
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Informações"
 
-#: ../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 "_Buscar"
 
@@ -2729,10 +2758,6 @@ msgstr "Enviar _mensagem simples"
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos _eventos pendentes"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Mostre _lista"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2842,13 +2867,13 @@ msgstr "Atribuir chave Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5666
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Editar _grupos"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5792
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Renomear"
 
@@ -2872,25 +2897,25 @@ msgstr "Recurso:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Cancelar confirmação"
 
-#: ../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 "Você está na execução de um comando. Você realmente deseja cancelar?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "O serviço alterou o identificador da sessão."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "O serviço enviou dados inválidos"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "O serviço alterou o identificador da sessão."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "O serviço retornou um erro."
 
@@ -2915,7 +2940,7 @@ msgstr "Inteiro"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:788
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Cor"
 
@@ -2940,6 +2965,11 @@ msgstr "(Nada)"
 msgid "Hidden"
 msgstr "Escondido"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Você recebeu uma nova entrada:"
+
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
@@ -3050,83 +3080,83 @@ msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:575
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:576
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/chat_control.py:770
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Indefinido"
 
-#: ../src/chat_control.py:771
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Doente"
 
-#: ../src/chat_control.py:794
+#: ../src/chat_control.py:796
 #, fuzzy
 msgid "Font"
 msgstr "_Fonte:"
 
-#: ../src/chat_control.py:803
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informações do contato"
 
-#: ../src/chat_control.py:875
+#: ../src/chat_control.py:877
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: ../src/chat_control.py:876
+#: ../src/chat_control.py:878
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Se você enviar um arquivo para %s, ele(a) saberá o seu Jabber ID real."
 
-#: ../src/chat_control.py:1262 ../src/chat_control.py:1651
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Criptografia GPG habilitada"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1292 ../src/chat_control.py:2153
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:878
-#: ../src/dialogs.py:1005 ../src/dialogs.py:1729 ../src/dialogs.py:1754
-#: ../src/gajim.py:988 ../src/gajim.py:1721 ../src/roster_window.py:910
-#: ../src/roster_window.py:1542 ../src/roster_window.py:1544
-#: ../src/roster_window.py:1890 ../src/roster_window.py:3121
-#: ../src/roster_window.py:3147 ../src/roster_window.py:5327
-#: ../src/roster_window.py:5512
+#: ../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 "Fora da lista"
 
-#: ../src/chat_control.py:1305
+#: ../src/chat_control.py:1310
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Uma lista de transferências de arquivo ativas, completadas e paradas"
 
-#: ../src/chat_control.py:1308
+#: ../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:1415 ../src/tooltips.py:626
+#: ../src/chat_control.py:1420 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Artista desconhecido"
 
-#: ../src/chat_control.py:1417 ../src/tooltips.py:631
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Título desconhecido"
 
-#: ../src/chat_control.py:1419 ../src/tooltips.py:636
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Fonte desconhecida"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:638
+#: ../src/chat_control.py:1427 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3135,17 +3165,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> por <i>%(artist)s</i>\n"
 "de <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1546
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s da conferência %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1631 ../src/dialogs.py:4033
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/chat_control.py:1632
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3153,50 +3183,50 @@ msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Você não poderá "
 "criptografar mensagem com GPG."
 
-#: ../src/chat_control.py:1641
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Criptografia GPG desabilitada"
 
-#: ../src/chat_control.py:1667
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control.py:1669
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1683
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "está"
 
-#: ../src/chat_control.py:1683
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NÃO está"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1685
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1685
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NÃO será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1689
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "e autenticada"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1693
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "e NÃO autenticada"
 
 #. 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:1699
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3205,26 +3235,26 @@ msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: ../src/chat_control.py:1747
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Comando sem suporte para conta zeroconf."
 
-#: ../src/chat_control.py:1758 ../src/groupchat_control.py:1661
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/chat_control.py:1761 ../src/groupchat_control.py:1675
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/chat_control.py:1764 ../src/groupchat_control.py:1680
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Uso: /%s, esconde os botões do bate-papo."
 
-#: ../src/chat_control.py:1767 ../src/groupchat_control.py:1696
+#: ../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 "
@@ -3233,38 +3263,38 @@ msgstr ""
 "Uso: /%(command)s <action>, emite a ação à sala atual. Use a terceira "
 "pessoa. (e.g. /%(command)s explodes.)"
 
-#: ../src/chat_control.py:1772
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Uso: /%s, envia um ping para o contato"
 
-#: ../src/chat_control.py:1775
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Uso: /%s, envia a mensagem para o contato"
 
-#: ../src/chat_control.py:1778 ../src/groupchat_control.py:1719
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
-#: ../src/chat_control.py:1911
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: ../src/chat_control.py:1921
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:1928
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3272,25 +3302,25 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: ../src/chat_control.py:1930
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: ../src/chat_control.py:1964 ../src/chat_control.py:1977
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#: ../src/chat_control.py:1970
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "A seguinte mensagem estava criptografada"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2351
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Você acabou de receber uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2352
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3298,15 +3328,15 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/chat_control.py:2500 ../src/common/connection_handlers.py:1965
-#: ../src/common/connection_handlers.py:2011
-#: ../src/common/connection_handlers.py:2199
-#: ../src/common/connection_handlers.py:2332 ../src/common/connection.py:1357
-#: ../src/gajim.py:158
+#: ../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 "Erro na base de dados"
 
-#: ../src/chat_control.py:2501
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3315,7 +3345,7 @@ msgstr ""
 "O arquivo da base de dados (%s) não pode ser lido. Tente repará-lo ou removê-"
 "lo. (todo o histórico será perdido)."
 
-#: ../src/chat_control.py:2731
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
@@ -3324,23 +3354,23 @@ msgstr "%(name)s agora está %(status)s"
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../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 é um arquivo, mas deveria ser um diretório"
 
-#: ../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 sairá agora"
 
-#: ../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 é um diretório, mas deveria ser um arquivo"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
@@ -3404,9 +3434,9 @@ msgstr "Selecione as salas das quais você quer sair"
 
 #. 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:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5103
+#: ../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 "Salas"
 
@@ -3422,72 +3452,72 @@ msgstr "Encaminhar mensagens não lidas"
 msgid "All unread messages have been forwarded."
 msgstr "Todas as mensagens não lidas foram encaminhadas."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tempo em minutos, depois do qual seu status muda para a afastado."
 
-#: ../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 (Afastado em conseqüência de estar inativo há mais de $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 ""
 "$S será substituída pela mensagem de status atual, $T pelo tempo de ausência "
 "automática."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tempo em minutos, depois do qual seu status muda para não disponível."
 
-#: ../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 (Não disponível em conseqüência de estar inativo há mais de $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 ""
 "$S será substituída pela mensagem de status atual, $T pelo tempo de "
 "indisponibilidade automática."
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:89
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:473
-#: ../src/common/optparser.py:228 ../src/common/optparser.py:446
-#: ../src/common/optparser.py:480 ../src/gajim.py:3277
+#: ../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 "padrão"
 
-#: ../src/common/config.py:110
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Ativar mensagens \"link-local\"/\"zeroconf\""
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Idioma usado pelo corretor ortográfico"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3497,7 +3527,7 @@ msgstr ""
 "'às vezes' - mostrar hora a cada print_ichat_every_foo_minutes minutos.\n"
 "'nunca' - nunca mostrar a hora."
 
-#: ../src/common/config.py:115
+#: ../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. "
@@ -3507,18 +3537,18 @@ msgstr ""
 "varia de 1 a 4, 0 desabilita a função. 1 é relógio mais preciso, 4 é o "
 "menos. Isto é usado apenas se o valor de print_time for 'às vezes'."
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Aproveite os pare * /_ como caracteres de formatação."
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Se verdadeiro, não remova */_. Assim *ABC* será negrito mas com * * não "
 "removido."
 
-#: ../src/common/config.py:122
+#: ../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/"
@@ -3529,7 +3559,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Se você quiser usar "
 "isso, instale o docutils)"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3537,7 +3567,7 @@ msgstr ""
 "Caracter a adicionar ao apelido quando se estiver usando o recurso de "
 "completar apelido (tecla Tab) na conferência."
 
-#: ../src/common/config.py:132
+#: ../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."
@@ -3545,7 +3575,7 @@ msgstr ""
 "O caracter a ser proposto para adicionar ao final do apelido desejado quando "
 "ele já estiver sendo usado por outra pessoa na conferência."
 
-#: ../src/common/config.py:160
+#: ../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 "
@@ -3556,19 +3586,19 @@ msgstr ""
 "por strftime na documentação do Python: http://docs.python.org/lib/module-"
 "time.html"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Os caracteres que são exibidos antes do apelido nas conversas"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Os caracteres que são exibidos após o apelidos nas conversas"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3576,12 +3606,12 @@ msgstr ""
 "Quantas linhas lembrar da conversação anterior quando uma aba/janela de bate-"
 "papo for reaberta."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Quantos minutos mostrar ao exibir as últimas linhas da conversação anterior."
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3589,11 +3619,11 @@ msgstr ""
 "Enviar a mensagem com Ctrl+Enter e criar uma nova linha com Enter "
 "(comportamento padrão do cliente ICQ da Mirabilis)."
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Quantas linhas armazenar com Ctrl+Acima."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3602,12 +3632,12 @@ msgstr ""
 "Uma ou outra URL costuma vir com %s onde %s é a palvra/frase ou em "
 "'WIKTIONARY' que significam o uso wiktionary."
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Se verificado, Gajim pode ser remotamente controlado usando gajim-remoto."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3619,14 +3649,14 @@ msgstr ""
 "configurado para Falso e se estiverem sincronizadas com o status global) "
 "baseado no status da conexão de rede."
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Notificações de estado de conversa enviados. Pode ser one of all, "
 "composing_only, disabled."
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3634,7 +3664,7 @@ msgstr ""
 "Notificações de estado de conversa exibidos nas janelas de conversa. Pode "
 "ser one of all, composing_only, disabled."
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3642,11 +3672,11 @@ msgstr ""
 "Quando não estiver exibindo a hora para cada mensagem (print_time == "
 "simetimes), exibi-lo a cada x minutos."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar um aba ou janela de conferência."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3654,7 +3684,7 @@ msgstr ""
 "Sempre perguntar antes de fechar um aba/janela nesta lista separada por "
 "espaço de JID's de conferências."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3662,13 +3692,13 @@ msgstr ""
 "Nunca perguntar antes de fechar uma aba/janela de conferência nesta lista "
 "separada por espaço de salas separadas por jids."
 
-#: ../src/common/config.py:186
+#: ../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:189
+#: ../src/common/config.py:183
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3677,27 +3707,27 @@ msgstr ""
 "interfaces locais, para Transferência de Arquivo no caso de tradução de "
 "endereço/encaminhamento de porta."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Padrão da IEC diz que KiB = 1024 bytes e KB = 1000 bytes."
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Notificar os eventos no ícone da bandeja do sistema."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Mostrar borda de caderno tabulada nas janelas de conversa?"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:202
+#: ../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 "
@@ -3709,18 +3739,18 @@ msgstr ""
 "16, 17 e 18. Números maiores são mais seguros, mas demoram mais para "
 "calcular quando você inicia uma sessão."
 
-#: ../src/common/config.py:211
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Pré-visualizar novas mensagens em uma janela popup?"
 
-#: ../src/common/config.py:216
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Uma lista separada por ponto-e-vírgula das palavras que serão destacadas nas "
 "conferências."
 
-#: ../src/common/config.py:217
+#: ../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."
@@ -3728,13 +3758,13 @@ msgstr ""
 "Se verdadeiro, o Gajim sairá quando o botão sair da janela for clicado. Esta "
 "opção só faz sentido quando a opção trayicon está sendo usada."
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Se verdadeiro, o Gajim verifica ao iniciar se é o cliente Jabber padrão."
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3742,7 +3772,7 @@ msgstr ""
 "Se verdadeiro, Gajim mostrará um ícone para cada aba contendo mensagens não "
 "lidas. Dependendo do tema, este ícone pode ser animado."
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3750,11 +3780,11 @@ msgstr ""
 "Se verdadeiro, o Gajim indicará a mensagem de status, se não estiver vazia, "
 "para cada contato sob o nome do contato na janela da lista."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Define a posição do avatar na lista. Pode ser esquerda ou direita"
 
-#: ../src/common/config.py:226
+#: ../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."
@@ -3762,7 +3792,7 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3770,7 +3800,7 @@ msgstr ""
 "Se falso, você não verá por mais muito tempo a linha de status nas conversas "
 "quando um contato alterar seu status e/ou sua mensagem de status."
 
-#: ../src/common/config.py:228
+#: ../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 "
@@ -3784,29 +3814,29 @@ msgstr ""
 "\" o Gajim exibirá todas as mensagens de status. Se for \"in_and_out\" o "
 "Gajim só mostrará FOO entradas/saídas em conferências."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Cor de fundo dos contatos quando eles simplesmente conectarem."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Cor de fundo dos contatos quando eles simplesmente desconectarem."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Se Verdadeiro, as mensagens restauradas usarão uma fonte menor que o padrão."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Não mostrar o avatar para o próprio transporte."
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Não mostrar a lista na bandeja do sistema."
 
-#: ../src/common/config.py:236
+#: ../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 "
@@ -3816,7 +3846,7 @@ msgstr ""
 "faz a janela piscar (o comportamento padrão na maioria dos Gerenciadores de "
 "Janela) quando esperam eventos pendentes."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3827,7 +3857,7 @@ msgstr ""
 "informações sha na presenças de conferências."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:241
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3848,32 +3878,32 @@ msgstr ""
 "'pertype' - Cada tipo de mensagem (ex. bate-papo vs. conferência) são "
 "enviadas para uma janela específica."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Se falso, você não verá por muito tempo o avatar na janela do bate-papo."
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Se verdadeiro, pressionando a tecla Esc fecha a aba/janela."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Esconder os botões nas janelas de conversa."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Esconder o banner na janela de conferência"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Esconder o banner na janela de conversa para duas pessoas"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Esconder a lista dos ocupantes da sala na janela da conferência."
 
-#: ../src/common/config.py:248
+#: ../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."
@@ -3881,15 +3911,15 @@ msgstr ""
 "Em uma conferência, mostrar o apelido no começo da linha apenas quando a "
 "mensagem atual não for da mesma pessoa que mandou a última."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Usar identação ao mesclar apelidos consecutivos."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Suavizar a rolagem de mensagens na janela de conversação"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3897,13 +3927,13 @@ msgstr ""
 "A lista de cores, separadas por \":\", que serão usadas para colorir os "
 "apelidos nas salas de conferência."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Quando nenhum aba tiver uma mensagem não lida, Ctrl + Tab vai para a próxima "
 "aba."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3911,7 +3941,7 @@ msgstr ""
 "Devemos mostrar o diálogo de confirmação de metacontatos ou não? Uma string "
 "vazia significa que nós nunca devemos mostrar o diálogo."
 
-#: ../src/common/config.py:254
+#: ../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 "
@@ -3922,7 +3952,7 @@ msgstr ""
 "autenticado com uma prioridade negativa, você NÃO poderá receber nenhuma "
 "mensagem do seu servidor."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3930,7 +3960,16 @@ msgstr ""
 "Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
 "as senhas das contas."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Se verdadeiro, o Gajim usará o Gnome Keyring (se disponível) para armazenar "
+"as senhas das contas."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3938,7 +3977,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim mostrará o número de contatos online e do total de "
 "contatos nas linha de conta e grupo."
 
-#: ../src/common/config.py:257
+#: ../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"
@@ -3946,7 +3985,7 @@ msgstr ""
 "Pode ser vazio, 'chat' ou 'normal'. Se for vazio, trata todas as mensagens "
 "recebidas como se elas fossem do tipo especificado"
 
-#: ../src/common/config.py:258
+#: ../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."
@@ -3954,7 +3993,7 @@ msgstr ""
 "Se Verdadeiro, o Gajim irá rolar e selecionar o contato que lhe enviou a "
 "última mensagem, se a janela de conversa ainda não estiver aberta."
 
-#: ../src/common/config.py:259
+#: ../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."
@@ -3962,13 +4001,13 @@ msgstr ""
 "Se definido como verdadeiro o Gajim converterá strings entre $$ e $$ em uma "
 "imagem usando o dvips antes de inseri-la em uma janela de conversa."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "O tempo de inatividade necessário antes de fechar a janela de alteração de "
 "status."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3976,7 +4015,7 @@ msgstr ""
 "Número máximo de linhas que são exibidas em conversações. As linhas mais "
 "antigas são apagadas."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3984,11 +4023,11 @@ msgstr ""
 "Se marcado como Verdadeiro as janelas de notificação do notification-daemon "
 "serão anexadas ao ícone da bandeja do sistema."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Escolha intervalo entre 2 verificações de inatividade."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3996,7 +4035,7 @@ msgstr ""
 "Alterar o valor para alterar o status das fórmulas latex exibidas. Quanto "
 "mais elevado é maior."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:260
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4005,13 +4044,13 @@ msgstr ""
 "Esquema uri válido. Somente esquemas nesta lista irão ser aceitos como uri "
 "\"real\"."
 
-#: ../src/common/config.py:266
+#: ../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:277
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4019,7 +4058,7 @@ msgstr ""
 "A prioridade será alterada automaticamente de acordo com o seu status. As "
 "prioridades são definidas nas opções autopriority_*."
 
-#: ../src/common/config.py:285
+#: ../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"
@@ -4028,27 +4067,27 @@ msgstr ""
 "inativo, fora, np, invisível. NOTA: esta opção é usada somente se a opção "
 "restore_last_status estiver desativada"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Se desativado, não assinar presenças com chaves GPG, se o GPG estiver "
 "configurado."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Habilitar criptografia ESessions para esta conta."
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "O Gajim deve iniciar automaticamente em sessão criptografada quando possível?"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4056,30 +4095,30 @@ msgstr ""
 "Lista ordenada de tipos de conexão (separada por espaço) para tentar. Pode "
 "conter tls, ssl ou simples"
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Exibir uma mensagem de alerta antes de usar uma biblioteca padrão SSL."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espaços de erros do ssl para ignorar."
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:304
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:305
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:313
+#: ../src/common/config.py:309
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4089,11 +4128,11 @@ msgstr ""
 "de tentarmos reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:317
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4101,15 +4140,15 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Respostas para requisições recebidas"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Requisições recebidas enviadas"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4117,11 +4156,11 @@ msgstr ""
 "Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
 "suas mensagens sejam gravadas?"
 
-#: ../src/common/config.py:407
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:408
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4129,101 +4168,101 @@ msgstr ""
 "O Gajim deve iniciar automaticamente uma sessão criptografada com este "
 "contato quando possível?"
 
-#: ../src/common/config.py:409 ../src/common/config.py:412
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Idioma a usar na verificação ortográficas das palavras"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "todos ou lista de status separados por espaço"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'sim', 'não' ou 'ambos'"
 
-#: ../src/common/config.py:420 ../src/common/config.py:422
-#: ../src/common/config.py:423 ../src/common/config.py:426
-#: ../src/common/config.py:427
+#: ../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 "'sim', 'não', ou ''"
 
-#: ../src/common/config.py:433 ../src/common/pep.py:160
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:130
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:437 ../src/common/pep.py:189
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:438
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:452 ../src/config.py:1414
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:455 ../src/common/config.py:456
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4231,99 +4270,99 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC contiver seu apelido."
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:476 ../src/common/optparser.py:242
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:480 ../src/common/optparser.py:228
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:484
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:488
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marinho"
 
-#: ../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 "Incapaz de carregar o módulo inativo"
 
-#: ../src/common/connection_handlers.py:236
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Servidor errado"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Endereço local inválido? :-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 "A informação do registo para o transporte %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:684
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registro para %s"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:685
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 #, fuzzy
 msgid "Registration failed"
 msgstr "Falha na conexão"
 
-#: ../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"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:970
-#: ../src/common/connection_handlers.py:1963
-#: ../src/common/connection_handlers.py:2009
-#: ../src/common/connection_handlers.py:2197
-#: ../src/common/connection_handlers.py:2330 ../src/common/connection.py:1355
-#: ../src/gajim.py:378
+#: ../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 "Erro de escrita em disco"
 
-#: ../src/common/connection_handlers.py:1177 ../src/common/connection.py:929
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/common/connection_handlers.py:1178 ../src/common/connection.py:930
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: ../src/common/connection_handlers.py:1791 ../src/common/connection.py:1170
-#: ../src/config.py:1844 ../src/config.py:1852 ../src/config.py:1895
-#: ../src/config.py:3120 ../src/dataforms_widget.py:537 ../src/dialogs.py:2462
+#: ../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 "Jabber ID inválido:"
 
-#: ../src/common/connection_handlers.py:1792
+#: ../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:1966
-#: ../src/common/connection_handlers.py:2012
-#: ../src/common/connection_handlers.py:2200
-#: ../src/common/connection_handlers.py:2333 ../src/common/connection.py:1358
-#: ../src/gajim.py:159
+#: ../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."
@@ -4333,78 +4372,77 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
 "será perdido)."
 
-#: ../src/common/connection_handlers.py:2084
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Apelido não permitido: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2159
-#: ../src/common/connection_handlers.py:2162
-#: ../src/common/connection_handlers.py:2165
-#: ../src/common/connection_handlers.py:2168
-#: ../src/common/connection_handlers.py:2172 ../src/gajim.py:531
+#: ../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 "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:2160
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Você está banido da sala %s."
 
-#: ../src/common/connection_handlers.py:2163
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "A sala %s não existe."
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:2169
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: ../src/common/connection_handlers.py:2173
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Você não está na lista de membros da sala %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2215
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "A sala foi excluída"
 
-#: ../src/common/connection_handlers.py:2222
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: ../src/common/connection_handlers.py:2249
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2270
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:2272
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "remoção de inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:2274
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection_handlers.py:2457
+#: ../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 "
@@ -4415,15 +4453,15 @@ msgstr ""
 "removê-lo"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2482
+#: ../src/common/connection_handlers.py:2614
 #: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Frase de acesso do OpenPGP não foi recebida"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2484
+#: ../src/common/connection_handlers.py:2616
 #: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1931
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
@@ -4556,81 +4594,81 @@ msgstr "O uso das chaves não inclui assinatura de certificado"
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O servidor %(name)s respondeu erroneamente à requisição de registro: %(error)"
 "s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "O servidor %s forneceu um formulário de registro diferente"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "O transporte %(name)s respondeu erroneamente à requisição de registro do "
 "pedido: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:762
-#: ../src/common/connection.py:1491
+#: ../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 "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1083
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:645
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Salvo em: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:742
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:743
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "A conexão com a conta %s foi perdida. Tentando reconectar."
 
-#: ../src/common/connection.py:709
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "A autenticidade do certificado %s pode ser inválida."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4639,7 +4677,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4648,24 +4686,24 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: ../src/common/connection.py:763
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:788
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique seu login e senha para exatidão."
 
-#: ../src/common/connection.py:856
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4674,17 +4712,17 @@ msgstr ""
 "A lista de privacidade %s não foi removida. Ela pode estar ativa em um ou "
 "mais recursos conectados. Desative-os e tente novamente."
 
-#: ../src/common/connection.py:1171 ../src/dialogs.py:2463
+#: ../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 "Não é possível enviar arquivos vazios"
 
-#: ../src/common/connection.py:1193
+#: ../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 "Nem a presença remota está assinada, nem uma chave foi atribuída."
 
-#: ../src/common/connection.py:1195
+#: ../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."
@@ -4692,11 +4730,11 @@ msgstr "A chave do contato (%s) não coincide com a chave atribuída no Gajim."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
 
-#: ../src/common/connection.py:1345
+#: ../src/common/connection.py:1359
 #: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
@@ -4706,20 +4744,30 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1524 ../src/common/connection.py:1545
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Convidar _contatos"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:988
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observadores"
 
 #: ../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:801 ../src/roster_window.py:814
-#: ../src/roster_window.py:1469 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1684
+#: ../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 "Transportes"
 
@@ -4728,11 +4776,11 @@ msgid "Not in roster"
 msgstr "Fora da lista"
 
 #. 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 "Acesso ao python D-Bus foi perdido neste computador"
 
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "As potencialidades do D-Bus no Gajim não podem ser usadas"
 
@@ -4763,385 +4811,385 @@ msgstr ""
 "O bus de sessão não está disponível.\n"
 "Veja http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "doze"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "um"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dois"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "três"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "quatro"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "cinco"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "seis"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sete"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "oito"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nove"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "dez"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "onze"
 
+#. 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 "doze"
-
-#. 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 horas"
+msgid "%(0)s o'clock"
+msgstr "%(0)s horas"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 e cinco"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s e cinco"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 e dez"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s e dez"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 e quinze"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s e quinze"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 e vinte"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s e vinte"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 e vinte e cinco"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s e vinte e cinco"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 e meia"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s e meia"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "vinte e cinco para as $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "vinte e cinco para as %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "vinte para as $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "vinte para as %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "quinze para as $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "quinze para as %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "dez para as $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "dez para as %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "cinco para as $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "cinco para as %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 horas"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s horas"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Madrugada"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Manhã"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Quase meio-dia"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Meio-dia"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Tarde"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Noite"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Tarde da noite"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Começo da semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Meio da semana"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Fim da semana"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Dono"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "está digitando..."
 
 #. 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 "parou de digitar"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:663
+#: ../src/common/helpers.py:653
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:666
+#: ../src/common/helpers.py:656
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:670
+#: ../src/common/helpers.py:660
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:673
+#: ../src/common/helpers.py:663
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:677
+#: ../src/common/helpers.py:667
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:680
+#: ../src/common/helpers.py:670
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:683
+#: ../src/common/helpers.py:673
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1189
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d mensagem pendente"
 msgstr[1] "%d mensagens pendentes"
 
-#: ../src/common/helpers.py:1195
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " da sala %s"
 
-#: ../src/common/helpers.py:1198 ../src/common/helpers.py:1217
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " do usuário %s"
 
-#: ../src/common/helpers.py:1200
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1207 ../src/common/helpers.py:1214
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d evento pendente"
 msgstr[1] "%d eventos pendentes"
 
-#: ../src/common/helpers.py:1247
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5162,15 +5210,15 @@ msgstr "%s não é um nível de gravação (loglevel) válido"
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:237 ../src/common/optparser.py:238
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:354
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, fuzzy, python-format
 msgid "XMPP account %s@%s"
 msgstr "da conta %s"
@@ -5899,20 +5947,20 @@ msgstr "Sua mensagem não pode ser enviada."
 msgid "Contact is offline. Your message could not be sent."
 msgstr "O contato está offline. Sua mensagem não pode ser enviada."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:588
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "A conexão ao computador não pode ser estabelecida: tempo excedido ao "
 "transmitir os dados."
 
-#: ../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 "Erro ao adicionar serviço. %s"
 
-#: ../src/config.py:151 ../src/config.py:610
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Desabilitado"
 
@@ -5924,20 +5972,12 @@ msgstr "Mensagem padrão"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/config.py:446
-msgid "Always use OS/X default applications"
-msgstr "Sempre usar as aplicações padrões do OS/X"
-
-#: ../src/config.py:447
-msgid "Custom"
-msgstr "Personalizar"
-
-#: ../src/config.py:676 ../src/dialogs.py:1301
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "O dicionário para o idioma %s não está disponível"
 
-#: ../src/config.py:677
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5946,68 +5986,68 @@ msgstr ""
 "Você precisa instalar o dicionário %s para usar a correção ortográfica ou "
 "selecionar outro idioma ajustando a opção 'speller_language'."
 
-#: ../src/config.py:1056
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1056
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
 #. Name column
-#: ../src/config.py:1336 ../src/dialogs.py:1929 ../src/dialogs.py:1993
-#: ../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 "Nome"
 
-#: ../src/config.py:1422
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1423
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Se você quer aplicar todas as mudanças, deve se re-autenticar."
 
-#: ../src/config.py:1551 ../src/config.py:1652
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1688 ../src/config.py:1733
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1689
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1715
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Todas as janelas de conversa e conferência serão fechadas. Confirma?"
 
-#: ../src/config.py:1729
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1730
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar desconectado."
 
-#: ../src/config.py:1734
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "Para mudar o nome da conta, você deve ler todas os eventos pendentes."
 
-#: ../src/config.py:1740
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1741
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6015,142 +6055,142 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1745 ../src/config.py:1749
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1746
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1750
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1825
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Renomear conta"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:1853
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve ter o seguinte formato \"usuario@nomedoservidor\"."
 
-#: ../src/config.py:2043 ../src/config.py:3180
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2044 ../src/config.py:3181
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2065
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2066
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de chave OpenPGP"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2109
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2110
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
-#: ../src/config.py:2117 ../src/dialogs.py:1781 ../src/dialogs.py:1917
-#: ../src/dialogs.py:2096 ../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 "Você não está conectado ao servidor"
 
-#: ../src/config.py:2118
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Você deve estar conectado para editar suas informações pessoais."
 
-#: ../src/config.py:2122
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2123
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2154
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2155
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Por favor renomeie ou remova-o antes de ativar troca de mensagens \"link-"
 "local\"."
 
-#: ../src/config.py:2338
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2340
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2376
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Lista de membros"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Lista de proprietários"
 
-#: ../src/config.py:2379
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2428 ../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:2438
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2445
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2451
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Cargo"
 
-#: ../src/config.py:2478
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2480
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6158,11 +6198,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2482
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Adicionando membro..."
 
-#: ../src/config.py:2483
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6170,11 +6210,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2485
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Adicionando proprietário..."
 
-#: ../src/config.py:2486
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6182,11 +6222,11 @@ msgstr ""
 "<b>Quem você quer tornar um proprietário?</b>\n"
 "\n"
 
-#: ../src/config.py:2488
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Adicionando administrador..."
 
-#: ../src/config.py:2489
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6194,7 +6234,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2490
+#: ../src/config.py:2500
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6211,78 +6251,90 @@ msgstr ""
 "4. domínio (o domínio combina por si com qualquer usuario@dominio,\n"
 "domínio/recurso, ou endereço contendo um subdomínio."
 
-#: ../src/config.py:2587
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2609 ../src/gajim.py:1472 ../src/gajim.py:1559
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2610 ../src/gajim.py:1542
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2611 ../src/gajim.py:1559
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2620
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2621
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2717
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:2717
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:2718
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:2787
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nova conferência"
 
-#: ../src/config.py:2820
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tem dados inválidos"
 
-#: ../src/config.py:2821
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Por favor, tenha certeza que preencheu os campos servidor e sala ou remova "
 "este marcador."
 
-#: ../src/config.py:3103
-msgid "Invalid username"
-msgstr "Nome de usuário inválido"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Apelido inválido"
 
-#: ../src/config.py:3105
-msgid "You must provide a username to configure this account."
-msgstr "Você deve entrar com um nome para configurar esta conta."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Apelido não permitido: %s"
+
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Servidor inválido"
 
-#: ../src/config.py:3137
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Entrada inválida"
+
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3138 ../src/config.py:3329
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6292,26 +6344,34 @@ msgstr ""
 "avançado, ou mais tarde clicando em contas no menu editar da janela "
 "principal."
 
-#: ../src/config.py:3156
-msgid "Invalid server"
-msgstr "Servidor inválido"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Sua nova conta foi criada com sucesso"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3157
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Você deve entrar com um nome para configurar esta conta."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, forneça um servidor no qual você queira se registrar."
 
-#: ../src/config.py:3208 ../src/gajim.py:2101
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: ../src/config.py:3209 ../src/gajim.py:2102
+#: ../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 ""
 "Este certificado já está no arquivo %s, então, ele não será adicionado "
 "novamente."
 
-#: ../src/config.py:3277
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6326,7 +6386,7 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: ../src/config.py:3283 ../src/gajim.py:2126
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6337,67 +6397,63 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: ../src/config.py:3308 ../src/config.py:3349
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3328
-msgid "Your new account has been created successfully"
-msgstr "Sua nova conta foi criada com sucesso"
-
-#: ../src/config.py:3415
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3416
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/config.py:3569
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:3577
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3612
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Primeira mensagem recebida"
 
-#: ../src/config.py:3613
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Nova mensagem recebida com foco"
 
-#: ../src/config.py:3615
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Nova mensagem recebida sem foco"
 
-#: ../src/config.py:3616
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Contato conectado"
 
-#: ../src/config.py:3617
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Contato desconectou"
 
-#: ../src/config.py:3618
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Mensagem enviada"
 
-#: ../src/config.py:3619
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem destacada de conferência"
 
-#: ../src/config.py:3620
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: ../src/config.py:3621
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "Email do GMail recebido"
 
-#: ../src/conversation_textview.py:567
+#: ../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"
@@ -6407,7 +6463,7 @@ msgstr ""
 "recebida por um fim remoto. Se este ícone continuar\n"
 "por muito tempo, isso indica que a mensagem foi perdida."
 
-#: ../src/conversation_textview.py:586
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6415,56 +6471,56 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a\n"
 "última vez onde você prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:699
+#: ../src/conversation_textview.py:702
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:718
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:753
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
-#: ../src/conversation_textview.py:1219
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1223
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1257
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -6526,111 +6582,111 @@ msgstr "%s mensagem de status"
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:746
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: ../src/dialogs.py:747
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Este nome já está sendo usado. Você quer sobrescrever essa mensagem de "
 "status?"
 
-#: ../src/dialogs.py:755
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:783
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:784
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:785
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:821
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, preencha os dados do contato se você quer adicionar na conta %s"
 
-#: ../src/dialogs.py:823
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:980 ../src/dialogs.py:986 ../src/dialogs.py:991
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:987
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: ../src/dialogs.py:1006
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:1007
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:1043
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:1102
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:1113
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Desenvolvedores atuais:"
 
-#: ../src/dialogs.py:1115
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Desenvolvedores passados:"
 
-#: ../src/dialogs.py:1121
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Nós gostaríamos de agradecer todos os mantedores do pacote."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1140
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
@@ -6638,7 +6694,7 @@ msgstr ""
 "Djavan Fagundes <dnoway@gmail.com>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6651,89 +6707,89 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1706
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "O apelido possui caracteres não permitidos."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Solicitação de inscrição para conta %(account)s de %(jid)s"
 
-#: ../src/dialogs.py:1709
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:1774 ../src/gajim.py:2773
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:1782
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:1801
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:1872
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: ../src/dialogs.py:1873 ../src/groupchat_control.py:1458
-#: ../src/groupchat_control.py:1742
-msgid "The nickname has not allowed characters."
-msgstr "O apelido possui caracteres não permitidos."
-
-#: ../src/dialogs.py:1877 ../src/dialogs.py:1883
-#: ../src/groupchat_control.py:1930
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:1878 ../src/dialogs.py:1884
-#: ../src/groupchat_control.py:1931
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: ../src/dialogs.py:1890
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:1891
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:1918
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sem uma conexão, você pode não sincronizar seus contatos."
 
-#: ../src/dialogs.py:1932
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:1965
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:1966
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Você não pode sincronizar com uma conta a menos que esteja conectado."
 
-#: ../src/dialogs.py:1990
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2048
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:2051
+#: ../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:"
@@ -6742,273 +6798,300 @@ msgstr ""
 "você quer enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2075 ../src/dialogs.py:2448 ../src/dialogs.py:2610
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:2076 ../src/dialogs.py:2449 ../src/dialogs.py:2611
+#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
-#: ../src/dialogs.py:2085 ../src/dialogs.py:2088
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:2088
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:2097
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: ../src/dialogs.py:2116
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../src/dialogs.py:2116
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:2121
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2160 ../src/notify.py:264 ../src/notify.py:505
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:2162 ../src/notify.py:272 ../src/notify.py:507
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2164 ../src/notify.py:295 ../src/notify.py:349
-#: ../src/notify.py:509 ../src/osx/growler.py:12
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nova mensagem"
 
 #. single message
-#: ../src/dialogs.py:2164 ../src/notify.py:276 ../src/notify.py:350
-#: ../src/notify.py:509 ../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 "Nova mensagem"
 
 #. private message
-#: ../src/dialogs.py:2165 ../src/notify.py:283 ../src/notify.py:350
-#: ../src/notify.py:510 ../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 "Enviar mensagem privada"
 
-#: ../src/dialogs.py:2165 ../src/gajim.py:1675 ../src/notify.py:519
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: ../src/dialogs.py:2167 ../src/gajim.py:1741 ../src/notify.py:512
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: ../src/dialogs.py:2169 ../src/gajim.py:1641 ../src/gajim.py:1708
-#: ../src/notify.py:514 ../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 "Erro na transferência de arquivos"
 
-#: ../src/dialogs.py:2171 ../src/gajim.py:1783 ../src/gajim.py:1805
-#: ../src/gajim.py:1822 ../src/notify.py:516 ../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 "Transferência do arquivo completa"
 
-#: ../src/dialogs.py:2172 ../src/gajim.py:1786 ../src/notify.py:517
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/dialogs.py:2174 ../src/gajim.py:1493 ../src/notify.py:521
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
-#: ../src/dialogs.py:2176 ../src/notify.py:256 ../src/notify.py:523
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: ../src/dialogs.py:2367
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: ../src/dialogs.py:2369
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: ../src/dialogs.py:2371
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2374
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2420
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Formulário %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2499
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2500
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2549
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:2551
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:2682
+#. 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 "Por favor, eu gostaria de adicioná-lo à minha lista."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Endereço"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Mal-humorado"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupo"
+
+#. 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 "Eu gostaria de adiciona-lo à minha lista."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:2742
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Ordem: %(order)s, ação: %(action)s tipo: %(type)s, valor: %(value)s"
 
-#: ../src/dialogs.py:2747
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: ../src/dialogs.py:2789
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:2876
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:2972
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:2974
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Você deve digitar um nome para criar uma lista de privacidade."
 
-#: ../src/dialogs.py:3077
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: ../src/dialogs.py:3080
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:3082
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact convidou você para entrar na conferência %(room_jid)s"
 
-#: ../src/dialogs.py:3090
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3092
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: ../src/dialogs.py:3148
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: ../src/dialogs.py:3158 ../src/dialogs.py:3212
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3199
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:3217
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:3284
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
 #. # means number
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3359
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:3477
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "quando eu estiver "
 
-#: ../src/dialogs.py:3949
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7019,19 +7102,19 @@ msgstr ""
 "\n"
 "A String Curta de Autenticação (SAS) da sessão é <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3953
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Você já verificou a identidade deste contato."
 
-#: ../src/dialogs.py:3959 ../src/dialogs.py:4046
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Identidade do contato verificada"
 
-#: ../src/dialogs.py:3967
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verificar novamente..."
 
-#: ../src/dialogs.py:3972
+#: ../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 "
@@ -7041,19 +7124,19 @@ msgstr ""
 "mensagens e enviar mensagens, você precisa verificar a identidade dela "
 "clicando no botão abaixo."
 
-#: ../src/dialogs.py:3975 ../src/dialogs.py:4027 ../src/dialogs.py:4040
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "A identidade do contato NÃO foi verificada"
 
-#: ../src/dialogs.py:3982
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:3994
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Você verificou a identidade deste contato?"
 
-#: ../src/dialogs.py:3995
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7068,24 +7151,24 @@ msgstr ""
 "\n"
 "Esta String de  Autenticação Curta é <b>%(sas)s</ b>."
 
-#: ../src/dialogs.py:3996
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Você quer falar com o contato remoto e verificar a SAS?"
 
-#: ../src/dialogs.py:4028
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "A chave do contato (%s) <b>não corresponde</b> com a chave atribuída no "
 "Gajim."
 
-#: ../src/dialogs.py:4034
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Então, você não pode "
 "criptografar mensagens."
 
-#: ../src/dialogs.py:4041
+#: ../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."
@@ -7094,7 +7177,7 @@ msgstr ""
 "nesta chave</b>, então as mensagens <b>não podem</b> ser criptografadas. Use "
 "seu cliente de GPG para validar esta chave."
 
-#: ../src/dialogs.py:4047
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7102,33 +7185,33 @@ msgstr ""
 "A chave GPG está atribuída para este contato, e você validou esta chave, "
 "então as mensagens serão criptografadas."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: ../src/disco.py:657
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../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."
@@ -7136,226 +7219,245 @@ msgstr ""
 "Não existe serviço para o endereço que você entrou, ou não está respondendo. "
 "Verifique o endereço e tente novamente."
 
-#: ../src/disco.py:662 ../src/disco.py:958
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:663
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Este tipo de serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:700 ../src/disco.py:710
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: ../src/disco.py:757
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: ../src/disco.py:797
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:959
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Este serviço não contém nenhum item para navegar."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Executar comando"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Varrendo %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1581
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Descrição"
 
 #. 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 "Marcador já configurado"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "A sala \"%s\" já existe nos marcadores."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Marcador foi adicionado com sucesso"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Você pode gerenciar seus marcadores pelo menu de ações na janela principal."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 #, fuzzy
 msgid "SSL certificat validation"
 msgstr "Erro de certificado SSL"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Uma biblioteca usada para validar os certificados do servidor para garantir "
 "uma conexão segura."
 
-#: ../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 "Requer o 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 ""
 "Conversa sem servidor com clientes detectados automaticamente em uma rede "
 "local."
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Requer o python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Requer pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 #, fuzzy
 msgid "Command line"
 msgstr "Comandos: %s"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Um script para controlar o Gajim via linha de comando."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Requer o 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 "Recurso não disponível no Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Criptografia OpenPGP"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Criptografando as mensagens das conversas com chaves GPG."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Requer gpg e python-GnuPGInterface."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Detecção automática do status da rede."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Requer gnome-network-manager e python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Gerenciamento de sessão"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "A sessão do Gajim é armazenada no logout and restaurada no login."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Requer python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Password encryption"
 msgstr "Senhas para entrar na sala"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 "As senhas podem ser armazenadas de maneira segura e não apenas em texto "
 "plano."
 
-#: ../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 "Requer gnome-keyring e 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 "Habilidade de conectar a servidores que estão usando registros SRV."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Requer dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Requer nslookup para usar registros SRV."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Verificador ortográfico"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Verificação ortográfica das mensagens escritas."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Requer python-sexy."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 #, fuzzy
 msgid "Notification"
 msgstr "Notificações"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Popups passivos notificando novos eventos."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7363,53 +7465,53 @@ msgstr ""
 "Requer python-notify ou então python-dbus em conjunto com notification-"
 "daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Ícone da bandeja"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Um ícone na bandeja do sistema refletindo a presença atual."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Requer python-gnome2-extras ou módulo trayicon compilado a partir dos fontes "
 "do Gajim."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Requer PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Ajustar para status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Habilidade de medir o tempo de inatividade para definir o status automático."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Requer python-gnome2."
 
-#: ../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 "Transforma expressões LaTeX entre $$ $$."
 
-#: ../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."
@@ -7417,7 +7519,7 @@ msgstr ""
 "Requer textlive-latex-base, e dvpng. Você tem que definir a opção "
 "'use_latex' para verdadeiro no Editor de configurações avançadas."
 
-#: ../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."
@@ -7426,25 +7528,25 @@ msgstr ""
 "definir a opção 'use_latex' para verdadeiro no Editor de configurações "
 "avançadas."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "Criptografia End to End (E2EE)"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Criptografando mensagens."
 
-#: ../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 "Requer python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Gerador RST"
 
-#: ../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)."
@@ -7452,25 +7554,25 @@ msgstr ""
 "Gera saída XHTML a partir de código RST (veja http://docutils.sourceforge."
 "net/docs/ref/rst/restructuredtext.html)."
 
-#: ../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 "Requer python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Habilidade de ter URL's clicáveis na janela de conversa e em banners da "
 "janela de conferência."
 
-#: ../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 "Requer python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Recurso"
 
@@ -7491,7 +7593,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
@@ -7499,7 +7601,7 @@ msgstr "Tamanho: %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 "Você"
 
@@ -7508,7 +7610,7 @@ msgstr "Você"
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
 #: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Destinatário: "
@@ -7541,51 +7643,52 @@ msgid "Error message: %s"
 msgstr "Mensagem de erro: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Transferência de arquivo parada pelo contato do outro lado"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Transferência do arquivo parada"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Escolha o arquivo para enviar..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Descrição: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Não é possível sobrescrever o arquivo \"%s\""
 
-#: ../src/filetransfers_window.py:334 ../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."
@@ -7593,33 +7696,33 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "O que você quer fazer?"
 
 #. 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:360 ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "O diretório \"%s\" não é gravável"
 
-#: ../src/filetransfers_window.py:360 ../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 "Você não tem permissão para criar este diretório."
 
-#: ../src/filetransfers_window.py:370
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Salvar arquivo como..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:436
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7627,64 +7730,69 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Arquivo: "
 
-#: ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:593 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:595 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:145
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 
-#: ../src/gajim.py:174
+#: ../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 "O Gajim necessita do PyGTK 2.8 ou superior"
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:171
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.8 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:173
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "O Gajim necessita do GTK 2.8 ou superior"
 
-#: ../src/gajim.py:178
+#: ../src/gajim.py:174
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.8 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7693,22 +7801,22 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Por favor certifique-se de que o GTK+ e o PyGTK tem suporte ao libglade em "
 "seu sistema."
 
-#: ../src/gajim.py:192
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necessita de PySQLite2 para rodar"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa do pywin32 para rodar"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7718,11 +7826,11 @@ msgstr ""
 "pode obtê-lo em %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:352
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:353
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7730,37 +7838,37 @@ msgstr ""
 "Outra instância do Gajim parece estar rodando\n"
 "Executar de qualquer forma?"
 
-#: ../src/gajim.py:443
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/gajim.py:444
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entre com a frase de acesso da chave GPG %(keyid)s para conta (account %"
 "(account)s)."
 
-#: ../src/gajim.py:458
+#: ../src/gajim.py:443
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/gajim.py:459
+#: ../src/gajim.py:444
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:468
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: ../src/gajim.py:469
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
 
-#: ../src/gajim.py:532
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7771,55 +7879,59 @@ msgstr ""
 "outro ocupante.\n"
 "Por favor, especifique um outro apelido abaixo:"
 
-#: ../src/gajim.py:546
+#: ../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 "Você aceita a solicitação?"
 
-#: ../src/gajim.py:548
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: ../src/gajim.py:551
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorização HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:602 ../src/notify.py:525 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: ../src/gajim.py:926 ../src/gajim.py:930
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erro %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:940 ../src/gajim.py:954
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:977 ../src/notify.py:527
+#: ../src/gajim.py:970 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: ../src/gajim.py:1002
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:1003
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: ../src/gajim.py:1015
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:1016
+#: ../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?"
@@ -7827,79 +7939,79 @@ msgstr ""
 "Você irá sempre ver ele ou ela como desconectado.\n"
 "Você quer removê-lo ou removê-la da sua lista de contatos?"
 
-#: ../src/gajim.py:1041 ../src/notify.py:529
+#: ../src/gajim.py:1034 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Desinscrever"
 
-#: ../src/gajim.py:1082
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:1271 ../src/groupchat_control.py:1169
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s agora é conhecido como %(new_nick)s"
 
-#: ../src/gajim.py:1289 ../src/groupchat_control.py:1344
-#: ../src/history_window.py:428 ../src/notify.py:251
+#: ../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 agora está %(status)s"
 
-#: ../src/gajim.py:1356
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s alterou o assunto para %(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:1420 ../src/groupchat_control.py:1129
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
-#: ../src/gajim.py:1423
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "A sala agora mostra membros indisponíveis"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Uma modificação na configuração da sala que não tem relação com privacidade "
 "ocorreu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "A gravação das conversas da sala está ativo agora"
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "A gravação das conversas da sala está desligado agora"
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: ../src/gajim.py:1438
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: ../src/gajim.py:1473
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Uma senha é requerida para ingressar na sala %s. Por favor, digite-a."
 
-#: ../src/gajim.py:1507
+#: ../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"
@@ -7907,20 +8019,20 @@ msgstr ""
 "Você configurou o Gajim para usar o agente do GPG, mas não há agente do GPG "
 "rodando ou então ele retornou uma frase secreta incorreta.\n"
 
-#: ../src/gajim.py:1509
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:1512
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:1535
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG não é usável"
 
-#: ../src/gajim.py:1535
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -7929,13 +8041,13 @@ msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Então, você não pode "
 "criptografar mensagens."
 
-#: ../src/gajim.py:1537 ../src/gajim.py:2184 ../src/gajim.py:2219
-#: ../src/groupchat_control.py:1871 ../src/message_window.py:212
-#: ../src/roster_window.py:3867
+#: ../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 "_Não me pergunte novamente"
 
-#: ../src/gajim.py:1545
+#: ../src/gajim.py:1540
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7945,19 +8057,19 @@ msgstr ""
 "(provavelmente a variável de ambiente não \t\t\t\t\t\t\testá corretamente "
 "definida)"
 
-#: ../src/gajim.py:1652
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1654
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Você tem %d nova mensagem de email"
 msgstr[1] "Você tem %d novas mensagens de email"
 
-#: ../src/gajim.py:1667
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7972,34 +8084,44 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1738
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: ../src/gajim.py:1806
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Remover contato da lista"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Erro lendo arquivo:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1810
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s de %(name)s parou."
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Você enviou com sucesso o %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1827
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de arquivo de %(filename)s para %(name)s parado."
 
-#: ../src/gajim.py:1924
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8008,36 +8130,36 @@ msgstr ""
 "Não foi possível descriptografar a mensagem de %s\n"
 "Ela pode ter sido adulterada."
 
-#: ../src/gajim.py:1931
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Não foi possível descriptografar a mensagem"
 
-#: ../src/gajim.py:2005
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Por favor digite um novo nome de usuário para sua conta local"
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2031
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2042
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Erro."
 
-#: ../src/gajim.py:2067
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8045,11 +8167,11 @@ msgstr ""
 "Você já está conectado a essa conta com o mesmo recurso. Por favor digite um "
 "novo"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8060,15 +8182,15 @@ msgstr ""
 "(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: ../src/gajim.py:2149
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Erro de certificado SSL"
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2156
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8084,11 +8206,11 @@ msgstr ""
 "\n"
 "Você ainda quer conectar e atualizar o fingerprint do certificado?"
 
-#: ../src/gajim.py:2180 ../src/gajim.py:2215
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: ../src/gajim.py:2181
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8096,11 +8218,11 @@ msgstr ""
 "Você está prestes a enviar sua senha em um conexão não-criptografada. Tem "
 "certeza que quer fazer isto?"
 
-#: ../src/gajim.py:2183 ../src/gajim.py:2218
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
 
-#: ../src/gajim.py:2216
+#: ../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?"
@@ -8108,21 +8230,21 @@ msgstr ""
 "Você está enviando sua senha em uma conexão não-segura. Você deve instalar o "
 "PyOpenSSL para prevenir isto. Você tem certeza que quer fazer isso?"
 
-#: ../src/gajim.py:2236
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "O nó PEP não foi removido"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "O nó PEP %(node)s não foi removido: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2730 ../src/gajim.py:2752
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/gajim.py:2731
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8130,7 +8252,7 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: ../src/gajim.py:2753
+#: ../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 "
@@ -8140,56 +8262,38 @@ msgstr ""
 "precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
 "org/wiki/Emoticons para mais detalhes."
 
-#: ../src/gajim.py:2779 ../src/roster_window.py:3355
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto estiver invisível"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3058
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:3155
-msgid "Bookmark already set"
-msgstr "Marcador já configurado"
-
-#: ../src/gajim.py:3156
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "A sala \"%s\" já existe nos marcadores."
-
-#: ../src/gajim.py:3169
-msgid "Bookmark has been added successfully"
-msgstr "Marcador foi adicionado com sucesso"
-
-#: ../src/gajim.py:3170
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Você pode gerenciar seus marcadores pelo menu de ações na janela principal."
-
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Mostra uma ajuda para um comando específico"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "comando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "mostrar ajuda no comando"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Mostrar ou esconder a janela principal"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Exibir uma janela popup com o próximo evento pendente"
 
-#: ../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"
@@ -8197,48 +8301,49 @@ msgstr ""
 "Exibir uma lista de todos os contatos na lista. Cada contato aparecerá em "
 "uma linha separada"
 
-#: ../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 "conta"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "mostrar somente os contatos desta conta"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Imprimir uma lista das contas registradas"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Mudar o status da conta ou contas"
 
 #. 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 ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
-#: ../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 "mensagem"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "mensagem de status"
 
-#: ../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"
@@ -8247,20 +8352,24 @@ msgstr ""
 "status de todas as contas existentes com a opção \"sincronizar com status "
 "global\" marcada"
 
-#: ../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 ""
 "Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
 "contato"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID do contato que você quer conversar"
 
-#: ../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 "se especificado, o contato é feito da lista de contatos desta conta"
 
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
 #: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8457,51 +8566,56 @@ msgstr "URI a manipular"
 msgid "Account in which you want to handle it"
 msgstr "Selecione a conta na qual você quer manipular isto"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "conteúdos da mensagem"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Entrar em uma sala MUC"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "sala"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Sala JID"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "apelido"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Apelido a ser usado"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "senha"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Senhas para entrar na sala"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Selecione a conta que você quer para entrar na sala"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Checar se o Gajim está rodando"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Mostrar ou esconder a janela ipython"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8510,16 +8624,16 @@ msgstr ""
 "'%s' não está em sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Você não tem uma conta ativa"
 
-#: ../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 ""
 "Parece que o Gajim não está rodando. Então você não pode usar o gajim-remote."
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8528,16 +8642,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8546,7 +8660,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../src/gajim-remote.py:482
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8555,7 +8669,7 @@ msgstr ""
 "Muitos argumentos. \n"
 "Digite \"%(basename)s help %(command)s\" para mais informações"
 
-#: ../src/gajim-remote.py:487
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8564,7 +8678,7 @@ msgstr ""
 "Argumento \"%(arg)s\" não está especificado. \n"
 "Digite\"%(basename)s help %(command)s\" para maiores informações"
 
-#: ../src/gajim-remote.py:506
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "URI incorreta"
 
@@ -8581,15 +8695,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Crie um novo tema com o nome que você desejar."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Você não pode apagar o seu tema corrente"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
@@ -8604,142 +8718,155 @@ msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Você não está mais na sala da conversa \"%(room)s\" ou \"%(nick)s\" saiu."
 
-#: ../src/groupchat_control.py:410
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Inserir apelido"
 
-#: ../src/groupchat_control.py:562
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Conversação com "
 
-#: ../src/groupchat_control.py:564
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Conversação continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:1137
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "O servidor atribuiu ou modificou o apelido da sua sala"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:1147
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s foi chutado por %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1154
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1158
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s foi banido por %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1167
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1205 ../src/groupchat_control.py:1209
-#: ../src/groupchat_control.py:1214
+#: ../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 foi removido da sala (%(reason)s)"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1216
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1285
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** A afiliação de %(nick)s foi alterada para %(affiliation)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1289
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** A afiliação de %(nick)s foi alterado para %(affiliation)s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s por %(actor)s"
 
-#: ../src/groupchat_control.py:1308
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** O cargo de %(nick)s foi definido para %(role)s"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1342
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1457 ../src/groupchat_control.py:1741
-msgid "Invalid nickname"
-msgstr "Apelido inválido"
-
-#: ../src/groupchat_control.py:1482 ../src/groupchat_control.py:1500
-#: ../src/groupchat_control.py:1586 ../src/groupchat_control.py:1603
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_control.py:1516
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Esta conferência não tem assunto"
 
-#: ../src/groupchat_control.py:1528
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 
-#: ../src/groupchat_control.py:1664
+#: ../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 "Apelido não encontrado: %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 ""
 "Uso: /%s <apelido|JID> [ razão ], expulsa o JID da conferência. O apelido de "
 "um ocupante pode ser substituído, mas não se contiver \"@\". Se o JID "
 "estiver atualmente na sala, ele/ela será chutado também. NÃO suporta espaços "
 "no apelido."
 
-#: ../src/groupchat_control.py:1671
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8748,7 +8875,7 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada com um ocupante "
 "específico."
 
-#: ../src/groupchat_control.py:1677
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8757,7 +8884,7 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8766,7 +8893,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida JID à sala atual, fornecendo opcionalmente "
 "uma razão."
 
-#: ../src/groupchat_control.py:1687
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8775,17 +8902,16 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_control.py:1691
-#, 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 ""
 "Uso: /%s <apelido> [razão], remove da sala o ocupante especificado pelo "
 "apelido e indica opcionalmente uma razão. Não suporta espaços no apelido."
 
-#: ../src/groupchat_control.py:1700
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8794,61 +8920,75 @@ msgstr ""
 "Uso: /%s <apelido> [mensagem], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Uso: /%s , mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1713
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "Uso: /%s [tópico], mostra ou atualiza o tópico da sala atual."
 
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Uso: /%s <mensagem>, envia uma mensagem sem procurar por outros comandos."
 
-#: ../src/groupchat_control.py:1865
+#: ../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 "Uso: /%s <apelido>, muda seu apelido na sala corrente."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Você tem certeza que quer deixar a conferência \"%s\"?"
 
-#: ../src/groupchat_control.py:1867
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Se você fechar esta janela, será desconectado desta conferência."
 
-#: ../src/groupchat_control.py:1904
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: ../src/groupchat_control.py:1905
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: ../src/groupchat_control.py:1910
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1937
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1938
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8856,22 +8996,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1940
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Você também pode entrar com um ponto de encontro alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2111
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:2112 ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2402
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8900,77 +9040,77 @@ msgstr "Detalhes"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Erro ao analisar o arquivo:"
 
 #. 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 ""
 "Não foi possível escrever em %s. O suporte de gerência da sessão não funciona"
 
 #. 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 "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Você gostaria de tornar o Gajim o cliente Jabber padrão?"
 
-#: ../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 "Sempre verificar ao iniciar se o Gajim é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../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 ""
 "A imagem não pode ser salva no formato %(type)s. Salvar como %(new_filename)"
 "s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: ../src/history_manager.py:96
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Não foi encontrado banco de dados do histórico de logs"
 
 #. holds jid
-#: ../src/history_manager.py:136
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Contatos"
 
 #. 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 "Data:"
 
 #. 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 "Apelido"
 
 #. 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 "Mensagem"
 
-#: ../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)"
@@ -8978,7 +9118,7 @@ msgstr ""
 "Você quer limpar o banco de dados? (ALTAMENTE NÃO RECOMENDADO COM O GAJIM EM "
 "EXECUÇÃO)"
 
-#: ../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 "
@@ -8992,26 +9132,26 @@ msgstr ""
 "\n"
 "Se caso você clicou SIM, por favor espere... "
 
-#: ../src/history_manager.py:433
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exportando histórico de logs..."
 
-#: ../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 em %(time)s disse: %(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] "Você realmente quer excluir os logs do contato selecionado?"
 msgstr[1] "Você realmente quer excluir os logs dos contatos selecionados?"
 
-#: ../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 "Esta é uma operação irreversível."
 
-#: ../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] "Você realmente quer excluir a mensagem selecionada?"
@@ -9083,71 +9223,67 @@ msgstr "- as mensagens serão gravadas"
 msgid "- messages will not be logged"
 msgstr "- as mensagens não serão gravadas"
 
-#: ../src/notify.py:249
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s alterou seu status"
 
-#: ../src/notify.py:259
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectou"
 
-#: ../src/notify.py:267
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectou"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova mensagem simples de %(nickname)s"
 
-#: ../src/notify.py:287
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensagem privada da conferência %s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:292
+#: ../src/notify.py:285
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensagem enviada por %(nickname)s"
 
-#: ../src/notify.py:298
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mensagem de %(nickname)s"
 
-#: ../src/notify.py:567
+#: ../src/notify.py:555
 #, fuzzy
 msgid "Ignore"
 msgstr "_Ignorar"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Genérico"
-
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2799
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2802
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2804 ../src/roster_window.py:2815
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
@@ -9178,46 +9314,46 @@ msgid ""
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:285 ../src/roster_window.py:939
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1891
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1892
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: ../src/roster_window.py:1904
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1905
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1930
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:2130 ../src/roster_window.py:3299
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2131 ../src/roster_window.py:3300
+#: ../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?"
@@ -9225,15 +9361,28 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências. Você tem certeza que quer ir invisível?"
 
-#: ../src/roster_window.py:2157
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: ../src/roster_window.py:2298 ../src/roster_window.py:2535
+#: ../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 "Você tem certeza que quer deixar a conferência \"%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 "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2299
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9241,16 +9390,16 @@ msgstr ""
 "Mensagens somente estarão disponíveis para leitura mais tarde se você tiver "
 "o histórico habilitado e contato na sua lista."
 
-#: ../src/roster_window.py:2536
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:2539
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2540
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9258,11 +9407,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:2543
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:2548
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9272,56 +9421,56 @@ msgstr ""
 "transportes: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2679
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: ../src/roster_window.py:2680
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:2687
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: ../src/roster_window.py:2688
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Você quer remover o grupo %s da lista?"
 
-#: ../src/roster_window.py:2747
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Também remove todos os contatos neste grupo da sua lista"
 
-#: ../src/roster_window.py:2786
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2787
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3139
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9330,11 +9479,11 @@ msgstr ""
 "ele ou ela sempre o verá offiline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3150
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: ../src/roster_window.py:3153
+#: ../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."
@@ -9342,16 +9491,16 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3160
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3165
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9361,20 +9510,20 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3221
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:3774
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: ../src/roster_window.py:3776
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9382,13 +9531,13 @@ msgstr ""
 "O seu servidor não suporta a gravação de informação de metacontatos, então "
 "essas informações não estarão salvas na próxima vez que você conectar."
 
-#: ../src/roster_window.py:3861
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Você está prestes a criar um metacontato. Tem certeza que quer continuar?"
 
-#: ../src/roster_window.py:3863
+#: ../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 "
@@ -9398,131 +9547,141 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:3976
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: ../src/roster_window.py:3987
+#: ../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] "Você quer enviar este arquivo para %s:"
 msgstr[1] "Você quer enviar estes arquivos para %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Enviar %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Fazer %s e %s metacontatos"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4664 ../src/roster_window.py:4735
-#: ../src/roster_window.py:4744 ../src/systray.py:216 ../src/systray.py:263
+#: ../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 "usando conta %s"
 
 #. add
-#: ../src/roster_window.py:4751
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:4756
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:4793 ../src/systray.py:279
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Gerenciar marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4813
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4853
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4915 ../src/roster_window.py:5016
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: ../src/roster_window.py:4942
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:4950
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Configurar serviços..."
 
-#: ../src/roster_window.py:5104
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
 #. Send Group Message
-#: ../src/roster_window.py:5112 ../src/roster_window.py:5638
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: ../src/roster_window.py:5120
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:5124
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
-#: ../src/roster_window.py:5535
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
 #. Send single message
-#: ../src/roster_window.py:5719
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5775
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5783
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
-#: ../src/roster_window.py:5857
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5864
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5944
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nova conferência"
 
 #. History manager
-#: ../src/roster_window.py:6057
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: ../src/roster_window.py:6066
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:6276
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Mudar mensagem de status..."
 
@@ -9543,16 +9702,16 @@ msgstr "Sem resultados"
 msgid "Disk WriteError"
 msgstr "Erro ao escrever em disco"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Assunto: %s"
 
-#: ../src/session.py:411 ../src/session.py:446
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Confirme essas opções de sessão"
 
-#: ../src/session.py:413
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9567,7 +9726,7 @@ msgstr ""
 "\n"
 "\tEssas opções são aceitáveis?"
 
-#: ../src/session.py:447
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9699,29 +9858,29 @@ msgstr ""
 "Este serviço não pode responder com informações detalhadas.\n"
 "É provável que esteja quebrado"
 
-#: ../src/vcard.py:241
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:243
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:264
+#: ../src/vcard.py:268
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:288 ../src/vcard.py:298 ../src/vcard.py:514
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "desde %s"
 
-#: ../src/vcard.py:327
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Afiliação:</b>"
 
-#: ../src/vcard.py:335
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9729,7 +9888,7 @@ msgstr ""
 "Este contato está interessado em sua informação de presença, mas você não "
 "está interessado na presença dele/dela"
 
-#: ../src/vcard.py:337
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9737,13 +9896,13 @@ msgstr ""
 "Você está interessado na informação da presença do contato, mas ele/ela não "
 "está interessado na sua"
 
-#: ../src/vcard.py:339
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contato estão interessados na informação da presença de cada um"
 
 #. None
-#: ../src/vcard.py:341
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9751,19 +9910,38 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum outro está "
 "interessado no seu"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido de inscrição"
 
-#: ../src/vcard.py:350
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Não há requisições de inscrições pendentes."
 
-#: ../src/vcard.py:355 ../src/vcard.py:410 ../src/vcard.py:539
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#, fuzzy
+#~ msgid "B_OSH Port:"
+#~ msgstr "_Porta:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Exibi_r lista"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizar"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Transferência de arquivo parada pelo contato do outro lado"
+
+#~ msgid "Generic"
+#~ msgstr "Genérico"
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Clique para ver os recursos do servidor jabber (como transportes MSN, "
@@ -9963,9 +10141,6 @@ msgstr " recurso com prioridade "
 #~ msgid "_Player:"
 #~ msgstr "_Tocador de som:"
 
-#~ msgid "Address"
-#~ msgstr "Endereço"
-
 #~ msgid "City:"
 #~ msgstr "Cidade:"
 
@@ -10293,9 +10468,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Derrubar %s no grupo %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Fazer %s e %s metacontatos"
-
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Esconder os botões na janela de conversa para duas pessoas."
 
diff --git a/po/ru.po b/po/ru.po
index 4a4e6c1db..0fb77d7ec 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-13 16:00+0200\n"
-"PO-Revision-Date: 2009-07-10 18:14+0300\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:02+0200\n"
 "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
 "Language-Team: Русский <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -112,52 +112,57 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Использовать прокси аут_ентификацию"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Подключиться, когда я нажму «Закончить»"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: мастер создания учетной записи"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "У меня уже есть учетная запись, которую я хочу _использовать"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Я хочу _зарегистрировать новую учетную запись"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../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 "Если отмечено, то Gajim запомнит пароль учетной записи"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Управление..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Про_кси:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Сохранить _пароль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Настроить мой профиль после соединения"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Использовать пользовательские хост/порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../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."
@@ -165,36 +170,36 @@ msgstr ""
 "Необходимо создать учетную запись для присоединения \n"
 "к сети Jabber."
 
-#: ../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 "_Дополнительно"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Хост: "
 
-#: ../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:57
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../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 "_Пароль:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
@@ -229,17 +234,17 @@ msgid "Administration operations"
 msgstr "Административные операции"
 
 #: ../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 "Автоподключение при разрыве связи"
 
 #: ../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 "_Соединяться при запуске 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 "И_зменить пароль"
 
@@ -256,23 +261,23 @@ msgstr ""
 "этой же опцией TLS отключается"
 
 #: ../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 "Выбрать _ключ..."
 
 #: ../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 "Щелкните для изменения пароля"
 
 #: ../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 ""
 "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
 
 #: ../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 "Соединение"
 
@@ -282,7 +287,7 @@ msgstr "Редактировать личную информацию..."
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:20
+#: ../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
@@ -293,10 +298,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:2710
-#: ../src/roster_window.py:5268
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Общие"
 
@@ -305,7 +310,7 @@ msgid "Hostname: "
 msgstr "Хост: "
 
 #: ../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."
@@ -314,7 +319,7 @@ msgstr ""
 "к вашему, так что передача файла имеет больше шансов на успех."
 
 #: ../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"
@@ -331,7 +336,7 @@ msgstr ""
 "чтение только для вас"
 
 #: ../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"
@@ -340,7 +345,7 @@ msgstr ""
 "jabber серверу с использованием этой учетной записи"
 
 #: ../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 "
@@ -351,13 +356,13 @@ msgstr ""
 "этой учетной записи"
 
 #: ../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 "Информация о вас, сохраненная на сервере"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1559
-#: ../src/config.py:2066
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
@@ -367,19 +372,19 @@ msgstr "Не выбран ключ"
 #. 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:1107
-#: ../src/config.py:1196 ../src/config.py:1464 ../src/config.py:1469
-#: ../src/config.py:1972 ../src/config.py:2052 ../src/config.py:2065
-#: ../src/config.py:3155 ../src/config.py:3223 ../src/dialogs.py:293
+#: ../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:2780 ../src/roster_window.py:2786
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
+#: ../src/roster_window.py:2800
 msgid "None"
 msgstr "Нет"
 
 #: ../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 "Личная информация"
@@ -389,12 +394,12 @@ msgid "Port: "
 msgstr "Порт: "
 
 #: ../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 "Приори_тет:"
 
 #: ../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 "
@@ -406,7 +411,7 @@ msgstr ""
 "события"
 
 #: ../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 "Изменять приоритет автоматически в соответствии со статусом."
 
@@ -415,12 +420,12 @@ msgid "Proxy:"
 msgstr "Прокси:"
 
 #: ../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 "Ресу_рс: "
 
 #: ../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 "
@@ -439,7 +444,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Сохранить _парольную фразу (небезопасно)"
 
 #: ../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 "_Сохранять историю для всех контактов"
 
@@ -448,12 +453,12 @@ msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
 #: ../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 "Син_хронизировать статус учетной записи с глобальным статусом"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Объединить контакты"
@@ -463,7 +468,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Использовать _SSL (устарело)"
 
 #: ../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 "Использовать прокси для передачи файла"
 
@@ -472,7 +477,7 @@ msgid "_Adjust to status"
 msgstr "В _зависимости от статуса"
 
 #: ../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 "_Имя: "
 
@@ -488,7 +493,12 @@ msgstr "В _зависимости от статуса"
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Использовать прокси аут_ентификацию"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -496,25 +506,25 @@ msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
 msgstr "_Соединяться при запуске 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 "Почта:"
 
-#: ../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 "Имя:"
 
-#: ../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 "Если отмечено, то Gajim запомнит пароль учетной записи"
 
-#: ../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"
@@ -524,85 +534,86 @@ msgstr ""
 "устраивает, вы можете выбрать другой.\n"
 "Также, возможно, придется изменить некоторые настройки брандмауэра."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:784
+#: ../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 "Фамилия:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Объединить учетные записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5219
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "П_ереименовать"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Send _keep-alive packets"
 msgstr "Отправлять _пинг"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Synchroni_ze account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 msgid "Use G_PG Agent"
 msgstr "Использовать GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use cust_om hostname/port"
 msgstr "Использовать польз_овательские хост/порт"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use cust_om port:"
 msgstr "_Другой порт:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 msgid "_Edit Personal Information..."
 msgstr "Редактировать личную информацию..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Enable"
 msgstr "_Включить"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Hostname: "
 msgstr "_Хост: "
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Manage..."
 msgstr "_Управление..."
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
 msgid "_Port: "
 msgstr "_Порт:"
 
 # insecure - небезопастный или незащищенный?
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Предупреждать перед использованием незащищенного соединения"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_использовать переменную HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -939,7 +950,7 @@ msgstr "Последнее изменение:"
 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 "Получена новая запись:"
 
@@ -1059,7 +1070,7 @@ msgstr "_Добавить в ростер"
 #: ../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:5915
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_История"
 
@@ -1167,7 +1178,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -1203,7 +1214,7 @@ msgstr ""
 "Контакт\n"
 "Баннер в окне чата"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:768
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Полужирный"
 
@@ -1227,7 +1238,7 @@ msgstr "Ушел"
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:769
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1307,8 +1318,8 @@ msgstr "_Забанить"
 
 #: ../data/glade/gc_occupants_menu.glade.h:7
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5247 ../src/roster_window.py:5724
-#: ../src/roster_window.py:5853
+#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
+#: ../src/roster_window.py:5862
 msgid "_Block"
 msgstr "_Блокировать"
 
@@ -1330,8 +1341,8 @@ msgstr "_Отправить личное сообщение"
 
 #: ../data/glade/gc_occupants_menu.glade.h:13
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5241 ../src/roster_window.py:5718
-#: ../src/roster_window.py:5850
+#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
+#: ../src/roster_window.py:5859
 msgid "_Unblock"
 msgstr "_Разблокировать"
 
@@ -1368,7 +1379,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2775
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
+#: ../src/dialogs.py:2908
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1422,7 +1434,7 @@ msgstr "Поиск:"
 msgid "_Log conversation history"
 msgstr "_История сообщения"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1807
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
@@ -1478,7 +1490,7 @@ msgstr "Сворачивать при автовходе"
 msgid "Print status:"
 msgstr "Показывать статус:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1507,10 +1519,6 @@ msgid "<b>Settings</b>"
 msgstr "<b>Настройки</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "B_OSH Port:"
-msgstr "Порт B_OSH:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1520,39 +1528,39 @@ 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 "Управление профилями прокси"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "П_ароль"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Proxy _Host:"
 msgstr "Хост прокси:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Port:"
 msgstr "_Порт прокси:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr "Использовать про_кси HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "Use proxy auth_entication"
 msgstr "Использовать прокси аут_ентификацию"
 
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr "URL _BOSH:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:14
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:16
+#: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
@@ -1603,7 +1611,7 @@ msgstr "Показать информацию о контакте (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 "_Отправить"
 
@@ -2199,7 +2207,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2899
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Список доступа"
 
@@ -2403,8 +2411,8 @@ msgstr "Удалить учетную запись из Gajim и с _серве�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5734 ../src/roster_window.py:5863
+#: ../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 "_Удалить"
 
@@ -2426,14 +2434,14 @@ msgstr "Редактировать _группы"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5806
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5174 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
@@ -2443,7 +2451,7 @@ msgstr "_Удалить"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5184 ../src/roster_window.py:5772
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
 
@@ -2552,7 +2560,8 @@ msgid "Show _Offline Contacts"
 msgstr "Показать _отключенных"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Показать _ростер"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2610,7 +2619,7 @@ msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5875
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Информация о контакте"
 
@@ -2724,10 +2733,6 @@ msgstr "Отправить _сообщение"
 msgid "Show All Pending _Events"
 msgstr "Показать непросмотренные _события"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Показать _ростер"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Ста_тус"
@@ -2836,13 +2841,13 @@ msgstr "Назначить ключ  Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5707
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Редактировать _группы"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "П_ереименовать"
 
@@ -2910,7 +2915,7 @@ msgstr "Целое"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:788
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Цвет"
 
@@ -2935,6 +2940,11 @@ msgstr "(Нет)"
 msgid "Hidden"
 msgstr "Скрытый"
 
+#: ../src/atom_window.py:110
+#, fuzzy, 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
@@ -3045,80 +3055,80 @@ msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:575
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:576
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:770
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Подчеркнутый"
 
-#: ../src/chat_control.py:771
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Зачеркнутый"
 
-#: ../src/chat_control.py:794
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:803
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Удалить форматирование"
 
-#: ../src/chat_control.py:875
+#: ../src/chat_control.py:877
 msgid "Really send file?"
 msgstr "Отправить файл?"
 
-#: ../src/chat_control.py:876
+#: ../src/chat_control.py:878
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr "Если вы пошлете файл %s, он/она узнает ваш настоящий Jabber ID."
 
-#: ../src/chat_control.py:1266 ../src/chat_control.py:1654
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG шифрование включено"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1295 ../src/chat_control.py:2154
+#: ../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:879
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1733 ../src/dialogs.py:1758
-#: ../src/gajim.py:978 ../src/gajim.py:1716 ../src/roster_window.py:932
-#: ../src/roster_window.py:1564 ../src/roster_window.py:1566
-#: ../src/roster_window.py:1912 ../src/roster_window.py:3147
-#: ../src/roster_window.py:3173 ../src/roster_window.py:5368
-#: ../src/roster_window.py:5553
+#: ../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 "Не в ростере"
 
-#: ../src/chat_control.py:1308
+#: ../src/chat_control.py:1310
 msgid "This contact does not support file transfer."
 msgstr "Этот контакт не поддерживает передачу файлов."
 
-#: ../src/chat_control.py:1311
+#: ../src/chat_control.py:1313
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей "
 "файл."
 
-#: ../src/chat_control.py:1418 ../src/tooltips.py:626
+#: ../src/chat_control.py:1420 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Неизвестный исполнитель"
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:631
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Неизвестная песня"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:636
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Неизвестный альбом"
 
-#: ../src/chat_control.py:1425 ../src/tooltips.py:638
+#: ../src/chat_control.py:1427 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3127,17 +3137,17 @@ msgstr ""
 "<b>«%(title)s»</b> <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1549
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s из комнаты %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1634 ../src/dialogs.py:4244
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Ключ GPG не присвоен"
 
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3145,50 +3155,50 @@ msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения с помощью GPG."
 
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG шифрование выключено"
 
-#: ../src/chat_control.py:1670
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Для сеанса БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
 
 #. encryption %s active
-#: ../src/chat_control.py:1686
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "было"
 
-#: ../src/chat_control.py:1686
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "НЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "будет"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "НЕ будет"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1692
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "и заверено"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1696
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "и НЕ заверено"
 
 #. 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:1702
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3197,26 +3207,26 @@ msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Команда не поддерживается учетной записью zeroconf."
 
-#: ../src/chat_control.py:1761 ../src/groupchat_control.py:1718
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Команды: %s"
 
-#: ../src/chat_control.py:1764 ../src/groupchat_control.py:1731
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Использование: /%s, очищает текстовое окно."
 
-#: ../src/chat_control.py:1767 ../src/groupchat_control.py:1736
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Использование: /%s, скрывает кнопки беседы."
 
-#: ../src/chat_control.py:1770 ../src/groupchat_control.py:1751
+#: ../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 "
@@ -3225,38 +3235,38 @@ msgstr ""
 "Использование: /%(command)s <действие>, совершает действие в текущей "
 "комнате. Используйте третье лицо (например, «/%(command)s взрывается».)"
 
-#: ../src/chat_control.py:1775
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Использование: /%s, посылает пинг контакту"
 
-#: ../src/chat_control.py:1778
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Использование: /%s, посылает сообщение контакту"
 
-#: ../src/chat_control.py:1781 ../src/groupchat_control.py:1780
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Нет подсказки для /%s"
 
-#: ../src/chat_control.py:1912
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: ../src/chat_control.py:1919
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: ../src/chat_control.py:1922
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1929
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3264,25 +3274,25 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
 "подробностей."
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:1965 ../src/chat_control.py:1978
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
-#: ../src/chat_control.py:1971
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Последнее сообщение зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2352
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
-#: ../src/chat_control.py:2353
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3290,15 +3300,15 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/chat_control.py:2508 ../src/common/connection_handlers.py:2045
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2422 ../src/common/connection.py:1357
-#: ../src/gajim.py:152
+#: ../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 "Ошибка базы данных"
 
-#: ../src/chat_control.py:2509
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3307,7 +3317,7 @@ msgstr ""
 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
 "или удалить (вся история будет утеряна)."
 
-#: ../src/chat_control.py:2739
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
@@ -3396,9 +3406,9 @@ msgstr "Выберите конференции, которые вы хотит�
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:806
-#: ../src/roster_window.py:1568 ../src/roster_window.py:1570
-#: ../src/roster_window.py:5144
+#: ../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 "Комнаты"
 
@@ -3465,9 +3475,9 @@ msgstr ""
 "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:468
+#: ../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:3290
+#: ../src/common/optparser.py:482 ../src/gajim.py:3300
 msgid "default"
 msgstr "По_умолчанию"
 
@@ -3929,6 +3939,15 @@ msgstr ""
 "хранения паролей учетных записей."
 
 #: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
+"хранения паролей учетных записей."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3936,7 +3955,7 @@ msgstr ""
 "Если активно, Gajim будет показывать количество контактов онлайн/всего в "
 "строках с названием учетной записи и групп."
 
-#: ../src/common/config.py:251
+#: ../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"
@@ -3944,7 +3963,7 @@ msgstr ""
 "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
 "входящие сообщения так, как будто бы они были этого типа."
 
-#: ../src/common/config.py:252
+#: ../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."
@@ -3952,7 +3971,7 @@ msgstr ""
 "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
 "сообщение последним, если окно чата еще небыло открыто."
 
-#: ../src/common/config.py:253
+#: ../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."
@@ -3960,17 +3979,17 @@ msgstr ""
 "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
 "используя dvips и конвертировать до вставки его в окно чата."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Время не активности прежде чем окно изменения статуса закроется."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3978,17 +3997,17 @@ msgstr ""
 "Если активно, окно уведомления от notification-daemon будет прикреплено к "
 "системному трею."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Выберите интервал между 2 проверками на бездействие."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Измените значение для изменения размера отображаемых формул LaTeX."
 
-#: ../src/common/config.py:259
+#: ../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 separately)"
@@ -3996,7 +4015,7 @@ msgstr ""
 "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
 "uri.(mailto и xmpp обрабатываются отдельно)"
 
-#: ../src/common/config.py:260
+#: ../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!"
@@ -4005,7 +4024,7 @@ msgstr ""
 "установлении соединения с учетной записью. ВНИМАНИЕ: Данная опция приводит к "
 "большому количеству посылаемых запросов!"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4013,7 +4032,7 @@ msgstr ""
 "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
 "для статусов задаются в пункте autopriority_* ."
 
-#: ../src/common/config.py:279
+#: ../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"
@@ -4021,27 +4040,27 @@ msgstr ""
 "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
 "поболтать, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Если включено, восстанавливать последний использованный статус."
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Если отключено, не подписывать присутствие ключом GPG, даже если GPG "
 "настроен."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Включить ESessions шифрование для данной учетной записи."
 
-#: ../src/common/config.py:288
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4049,31 +4068,31 @@ msgstr ""
 "Упорядоченный список (разделённый пробелами) типов подключения, которые "
 "будут перепробованы. Может включать tls, ssl или plain"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Разделенный пробелами список игнорирования ошибок ssl"
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:304
 msgid "Whitespace sent after inactivity"
 msgstr "Пробел, посылаемый после бездействия"
 
 # дословно: пинг XMPP послал после бездействия. Возможно, ошибка в оригинале.
-#: ../src/common/config.py:303
+#: ../src/common/config.py:305
 msgid "XMPP ping sent after inactivity"
 msgstr "пинг XMPP, посылаемый после бездействия"
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:309
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4082,11 +4101,11 @@ msgstr ""
 "соединения."
 
 #. yes, no, ask
-#: ../src/common/config.py:311
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4094,15 +4113,15 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Отвечать на запросы уведомления"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Посылать запросы уведомления"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4110,11 +4129,11 @@ msgstr ""
 "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
 "вы хотите сохранить историю сообщений?"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4122,101 +4141,101 @@ msgstr ""
 "Должен ли Gajim по возможности автоматически начинать для данного контакта "
 "зашифрованный сеанс?"
 
-#: ../src/common/config.py:404 ../src/common/config.py:407
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "все или статусы, разделенные пробелом"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "«yes» (да), «no» (нет) или «both» (оба)"
 
-#: ../src/common/config.py:415 ../src/common/config.py:417
-#: ../src/common/config.py:418 ../src/common/config.py:421
-#: ../src/common/config.py:422
+#: ../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» (нет) или «» (пусто)"
 
-#: ../src/common/config.py:428 ../src/common/pep.py:160
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:430 ../src/common/pep.py:130
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:432 ../src/common/pep.py:189
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:447 ../src/config.py:1396
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:450 ../src/common/config.py:451
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4225,23 +4244,23 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:471 ../src/common/optparser.py:244
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:475 ../src/common/optparser.py:230
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "морской"
 
@@ -4250,73 +4269,73 @@ msgstr "морской"
 msgid "Unable to load idle module"
 msgstr "Не могу загрузить модуль «idle»"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Неверный хост"
 
-#: ../src/common/connection_handlers.py:238
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Неправильный локальный адрес? :-O"
 
-#: ../src/common/connection_handlers.py:671
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:684
 msgid "Registration succeeded"
 msgstr "Регистрация завершена"
 
-#: ../src/common/connection_handlers.py:679
+#: ../src/common/connection_handlers.py:685
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрация сервиса %s завершена успешно"
 
-#: ../src/common/connection_handlers.py:681
+#: ../src/common/connection_handlers.py:687
 msgid "Registration failed"
 msgstr "Ошибка регистрации"
 
-#: ../src/common/connection_handlers.py:681
+#: ../src/common/connection_handlers.py:687
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Регистрация сервиса %(agent)s завершилась ошибкой: %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:976
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2089
-#: ../src/common/connection_handlers.py:2284
-#: ../src/common/connection_handlers.py:2420 ../src/common/connection.py:1355
-#: ../src/gajim.py:366
+#: ../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:1197 ../src/common/connection.py:929
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Невидимость не поддерживается"
 
-#: ../src/common/connection_handlers.py:1198 ../src/common/connection.py:930
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: ../src/common/connection_handlers.py:1864 ../src/common/connection.py:1170
-#: ../src/config.py:1826 ../src/config.py:1834 ../src/config.py:1877
-#: ../src/config.py:3105 ../src/dataforms_widget.py:537 ../src/dialogs.py:2466
+#: ../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 "Неверный Jabber ID"
 
-#: ../src/common/connection_handlers.py:1865
+#: ../src/common/connection_handlers.py:1892
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Было получено сообщение от неверного JID, оно было проигнорировано."
 
-#: ../src/common/connection_handlers.py:2046
-#: ../src/common/connection_handlers.py:2092
-#: ../src/common/connection_handlers.py:2287
-#: ../src/common/connection_handlers.py:2423 ../src/common/connection.py:1358
-#: ../src/gajim.py:153
+#: ../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."
@@ -4326,78 +4345,77 @@ msgstr ""
 "(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
 "будет утеряна)."
 
-#: ../src/common/connection_handlers.py:2171
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Ник недопустим: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2246
-#: ../src/common/connection_handlers.py:2249
-#: ../src/common/connection_handlers.py:2252
-#: ../src/common/connection_handlers.py:2255
-#: ../src/common/connection_handlers.py:2259 ../src/gajim.py:514
+#: ../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 "Не получается войти в комнату"
 
-#: ../src/common/connection_handlers.py:2247
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам запрещено входить в комнату %s."
 
-#: ../src/common/connection_handlers.py:2250
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Комнаты %s не существует."
 
-#: ../src/common/connection_handlers.py:2253
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Создание комнат запрещено."
 
-#: ../src/common/connection_handlers.py:2256
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
 
-#: ../src/common/connection_handlers.py:2260
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас нет в списке членов комнаты %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Комната была удалена"
 
-#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2360
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "теперь мы подписались на %s"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: ../src/common/connection_handlers.py:2364
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "теперь мы отписались от %s"
 
-#: ../src/common/connection_handlers.py:2553
+#: ../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 "
@@ -4408,15 +4426,15 @@ msgstr ""
 "удалить его"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2587
+#: ../src/common/connection_handlers.py:2614
 #: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2589
+#: ../src/common/connection_handlers.py:2616
 #: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
@@ -4549,77 +4567,77 @@ msgstr "Назначение ключа не включает подписыва
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью «%s» была потеряна"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Переподключаться вручную."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s предоставил другую регистрационную форму"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Неверный ответ"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:762
-#: ../src/common/connection.py:1510
+#: ../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 "Не могу соединиться с «%s»"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1073
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:645
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер ответил: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Соединение с прокси разорвалось"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:742
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не могу соединиться с %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:743
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
 
-#: ../src/common/connection.py:709
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4628,7 +4646,7 @@ msgstr ""
 "\n"
 "Ошибка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4637,24 +4655,24 @@ msgstr ""
 "\n"
 "Неизвестная ошибка SSL: %d"
 
-#: ../src/common/connection.py:763
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:788
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с «%s»"
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Проверьте правильность логина и пароля."
 
-#: ../src/common/connection.py:856
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Ошибка при удалении списка доступа"
 
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4663,17 +4681,17 @@ msgstr ""
 "Список доступа %s не может быть удален. Возможно, он используется одним из "
 "ваших активных ресурсов. Отключите ресурс и попробуйте снова."
 
-#: ../src/common/connection.py:1171 ../src/dialogs.py:2467
+#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не удалось передать сообщение %s — этот JID неверен."
 
-#: ../src/common/connection.py:1193
+#: ../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:1195
+#: ../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."
@@ -4681,11 +4699,11 @@ msgstr "Ключ (%s) контакта не соответствует ключ�
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
 
-#: ../src/common/connection.py:1345
+#: ../src/common/connection.py:1359
 #: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
@@ -4695,30 +4713,30 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1372
+#: ../src/common/connection.py:1386
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1375
+#: ../src/common/connection.py:1389
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Пригласить _участников"
 
-#: ../src/common/connection.py:1543 ../src/common/connection.py:1564
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:978
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Наблюдатели"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:787 ../src/roster_window.py:836
-#: ../src/roster_window.py:1491 ../src/roster_window.py:1560
-#: ../src/roster_window.py:1562 ../src/roster_window.py:1706
+#: ../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 "Транспорты"
 
@@ -4761,153 +4779,153 @@ msgstr ""
 "Шина D-Bus не доступна.\n"
 "Попробуйте прочитать http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "двенадцать"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "один"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "два"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "три"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "четыре"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "пять"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "шесть"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "семь"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "восемь"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "девять"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "десять"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "одиннадцать"
 
+#. 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 "двенадцать"
+msgid "%(0)s o'clock"
+msgstr "%(0)s"
 
-#. 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"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "пять минут $1"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "пять минут %(1)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "десять минут $1"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "десять минут %(1)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "четверть $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "четверть %(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "двадцать минут $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "двадцать минут %(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "двадцать пять минут $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "двадцать пять минут %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "половина $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "половина %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "без двадцати пяти $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "без двадцати пяти %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "без двадцати $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "без двадцати %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "без четверти $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "без четверти %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "без десяти $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "без десяти %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "без пяти $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "без пяти %(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 "Ночь"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Раннее утро"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Утро"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "День"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Полдень"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "День"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Вечер"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Поздний вечер"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Начало недели"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Середина недели"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Конец недели"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Выходные!"
 
@@ -4951,7 +4969,7 @@ msgstr "Готов поболтать"
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Доступен"
 
@@ -5170,7 +5188,7 @@ msgstr "синий"
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP учетная запись %s@%s"
@@ -5897,12 +5915,12 @@ msgstr "Ваше сообщение не может быть отправлен�
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт не в сети. Отправить сообщение не удалось."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:588
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "Не удалось соединиться с хостом: истекло время ожидания."
 
-#: ../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"
@@ -5943,202 +5961,202 @@ msgid "status message text"
 msgstr "текст сообщения о статусе"
 
 #. Name column
-#: ../src/config.py:1318 ../src/dialogs.py:1933 ../src/dialogs.py:1997
-#: ../src/dialogs.py:2686 ../src/disco.py:773 ../src/disco.py:1568
+#: ../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 "Имя"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1533 ../src/config.py:1634
+#: ../src/config.py:1521 ../src/config.py:1643
 msgid "OpenPGP is not usable on this computer"
 msgstr "Невозможно использовать OpenPGP на этом компьютере"
 
-#: ../src/config.py:1670 ../src/config.py:1715
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1671
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1697
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1698
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1712
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1722
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1723
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Выберите другое."
 
-#: ../src/config.py:1727 ../src/config.py:1731
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1728
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1732
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1807
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Переименовать учетную запись"
 
-#: ../src/config.py:1808
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введите новое название для учетной записи %s"
 
-#: ../src/config.py:1835
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
 
-#: ../src/config.py:2027 ../src/config.py:3165
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:2028 ../src/config.py:3166
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:2049
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:2050
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Возникла проблема с получением вашего секретного ключа OpenPGP."
 
-#: ../src/config.py:2085
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:2086
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: ../src/config.py:2093
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:2101 ../src/dialogs.py:1785 ../src/dialogs.py:1921
-#: ../src/dialogs.py:2100 ../src/disco.py:441 ../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 "Вы не подключены к серверу"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
 
-#: ../src/config.py:2106
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:2107
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:2138
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2139
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2322
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2324
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the beginning
-#: ../src/config.py:2360
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2363
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Список администраторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2412 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2429
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2435
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2462
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2464
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6146,11 +6164,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2467
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6158,11 +6176,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2469
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2470
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6170,11 +6188,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2472
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2473
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6182,7 +6200,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2500
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6198,77 +6216,90 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2571
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2593 ../src/gajim.py:1462 ../src/gajim.py:1554
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2594 ../src/gajim.py:1534
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2595 ../src/gajim.py:1554
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2604
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Все"
 
-#: ../src/config.py:2703
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2704
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Нет"
 
-#: ../src/config.py:2772
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Удостоверьтесь, что заполнены поля с именем сервера и комнаты, либо удалите "
 "эту закладку."
 
-#: ../src/config.py:3088
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3090
-msgid "You must provide a username to configure this account."
-msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Ник недопустим: %s"
 
-#: ../src/config.py:3122
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Неверный сервер"
+
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Неверная запись"
+
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3123 ../src/config.py:3314
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6278,24 +6309,32 @@ msgstr ""
 "«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
 "меню «Правка» в главном окне программы."
 
-#: ../src/config.py:3141
-msgid "Invalid server"
-msgstr "Неверный сервер"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Ваша новая учетная запись успешно создана"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3142
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
 
-#: ../src/config.py:3193 ../src/gajim.py:2101
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: ../src/config.py:3194 ../src/gajim.py:2102
+#: ../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 "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: ../src/config.py:3262
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6310,7 +6349,7 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Соединиться с этим сервером?"
 
-#: ../src/config.py:3268 ../src/gajim.py:2126
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6321,67 +6360,63 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: ../src/config.py:3293 ../src/config.py:3334
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3313
-msgid "Your new account has been created successfully"
-msgstr "Ваша новая учетная запись успешно создана"
-
-#: ../src/config.py:3400
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/config.py:3554
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:3597
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:3598
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Следующее сообщение получено в окне с фокусом"
 
-#: ../src/config.py:3600
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Следующее сообщение получено в окне без фокуса"
 
-#: ../src/config.py:3601
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:3602
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:3603
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:3604
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:3605
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:3606
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
-#: ../src/conversation_textview.py:567
+#: ../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"
@@ -6391,7 +6426,7 @@ msgstr ""
 "Если иконка не пропадает долгое время,\n"
 "это означает, что сообщение потеряно."
 
-#: ../src/conversation_textview.py:586
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6399,55 +6434,55 @@ msgstr ""
 "Текст под этой линией был сказан после того,\n"
 "как вы последний раз заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:699
+#: ../src/conversation_textview.py:702
 msgid "_Quote"
 msgstr "_Цитировать"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для «%s»"
 
-#: ../src/conversation_textview.py:718
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "В URL словаря отсутствует «%s» и это не WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:753
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "В URL Web-поиска отсутствует  «%s»"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Открыть как _ссылку"
 
-#: ../src/conversation_textview.py:1220
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1224
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1258
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6632,88 +6667,88 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/dialogs.py:1710
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
 
-#: ../src/dialogs.py:1713
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:1778 ../src/gajim.py:2774
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:1805
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:1877 ../src/groupchat_control.py:1473
-#: ../src/groupchat_control.py:1803
-msgid "The nickname has not allowed characters."
-msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
-
-#: ../src/dialogs.py:1881 ../src/dialogs.py:1887
-#: ../src/groupchat_control.py:1991
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1888
-#: ../src/groupchat_control.py:1992
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:1895
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:1922
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:1969
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: ../src/dialogs.py:2052
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать чат с учетной записью %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: ../src/dialogs.py:2055
+#: ../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:"
@@ -6721,297 +6756,297 @@ msgstr ""
 "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2079 ../src/dialogs.py:2452 ../src/dialogs.py:2614
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: ../src/dialogs.py:2080 ../src/dialogs.py:2453 ../src/dialogs.py:2615
+#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: ../src/dialogs.py:2089 ../src/dialogs.py:2092
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:2092
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса «%s»."
 
-#: ../src/dialogs.py:2101
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Необходимо ввести пароль."
 
-#: ../src/dialogs.py:2124
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2164 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: ../src/dialogs.py:2166 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2168 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:2168 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:2169 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:2169 ../src/gajim.py:1670 ../src/notify.py:505
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:2171 ../src/gajim.py:1736 ../src/notify.py:498
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:2173 ../src/gajim.py:1636 ../src/gajim.py:1703
+#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:2175 ../src/gajim.py:1778 ../src/gajim.py:1800
-#: ../src/gajim.py:1817 ../src/notify.py:502
+#: ../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 "Передача файла завершена"
 
-#: ../src/dialogs.py:2176 ../src/gajim.py:1781 ../src/notify.py:503
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:2178 ../src/gajim.py:1483 ../src/notify.py:507
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:2180 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: ../src/dialogs.py:2371
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:2373
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:2375
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2401
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2424
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "От %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2504
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:2553
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2555
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2665
+#: ../src/dialogs.py:2789
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
-#: ../src/dialogs.py:2683
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: ../src/dialogs.py:2689
-msgid "Groups"
-msgstr "Группы"
-
-#: ../src/dialogs.py:2720
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
 msgid "Add"
 msgstr "Добавить"
 
-#: ../src/dialogs.py:2751
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
 msgid "Modify"
 msgstr "Изменить"
 
+#: ../src/dialogs.py:2812
+msgid "Jabber ID"
+msgstr "Jabber ID"
+
+#: ../src/dialogs.py:2818
+msgid "Groups"
+msgstr "Группы"
+
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2798
+#: ../src/dialogs.py:2929
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
-#: ../src/dialogs.py:2893
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2897
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:2953
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Номер: %(order)s,действие: %(action)s, тип: %(type)s, значение: %(value)s"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Номер: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3000
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:3087
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:3183
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:3185
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:3255
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:3256
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: ../src/dialogs.py:3288
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Вы приглашены в конференцию"
 
-#: ../src/dialogs.py:3291
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact приглашает вас присоединиться к обсуждению."
 
-#: ../src/dialogs.py:3293
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact приглашает вас в комнату %(room_jid)s."
 
-#: ../src/dialogs.py:3301
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:3303
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Вы принимаете приглашение?"
 
-#: ../src/dialogs.py:3359
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:3369 ../src/dialogs.py:3423
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:3374
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:3410
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:3428
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:3493
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
 #. # means number
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3570
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:3688
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "когда я "
 
-#: ../src/dialogs.py:4160
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7022,19 +7057,19 @@ msgstr ""
 "\n"
 "Short Authentication String данного сеанса <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4164
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Вы уже удостоверили личность этого контакта."
 
-#: ../src/dialogs.py:4170 ../src/dialogs.py:4257
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Личность контакта удостоверена"
 
-#: ../src/dialogs.py:4178
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Удостоверить снова..."
 
-#: ../src/dialogs.py:4183
+#: ../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 "
@@ -7044,19 +7079,19 @@ msgstr ""
 "сообщения или послать сообщения вам, вы должны удостоверить личность "
 "собеседника, нажав кнопку, расположенную ниже."
 
-#: ../src/dialogs.py:4186 ../src/dialogs.py:4238 ../src/dialogs.py:4251
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Личность контакта НЕ удостоверена"
 
-#: ../src/dialogs.py:4193
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Удостоверить..."
 
-#: ../src/dialogs.py:4205
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Вы удостоверили личность удаленного контакта?"
 
-#: ../src/dialogs.py:4206
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7071,23 +7106,23 @@ msgstr ""
 "\n"
 "Short Authentication String этого сеанса <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4207
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
 
-#: ../src/dialogs.py:4239
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ключ (%s) контакта <b>не соответствует</b> ключу, присвоенному в Gajim."
 
-#: ../src/dialogs.py:4245
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения."
 
-#: ../src/dialogs.py:4252
+#: ../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."
@@ -7096,7 +7131,7 @@ msgstr ""
 "Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
 "вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
 
-#: ../src/dialogs.py:4258
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7191,20 +7226,20 @@ msgstr "Описание"
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3168
+#: ../src/disco.py:1659 ../src/gajim.py:3178
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3169
+#: ../src/disco.py:1660 ../src/gajim.py:3179
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната «%s» уже есть в ваших закладках."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3182
+#: ../src/disco.py:1669 ../src/gajim.py:3192
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3183
+#: ../src/disco.py:1670 ../src/gajim.py:3193
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
 
@@ -7228,196 +7263,197 @@ msgstr "_Подписаться"
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 msgid "SSL certificat validation"
 msgstr "Подтверждение SSL сертификата"
 
-#: ../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 "Требует 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 "Требует python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Требует pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Command line"
 msgstr "Командная строка"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт для управления Gajim'ом через командную строку."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Требует 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 "Эта возможность отсутствует в Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP шифрование"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрование сообщений при помощи gpg ключей."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Требует gpg и 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 "Автоопределение состояния соединения с сетью."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Требует gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Управление сеансами"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Сеанс Gajim сохраняется при выходе (logout) и восстанавливается при входе "
 "(login)."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Требует python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Password encryption"
 msgstr "Шифрование паролей"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Пароли могут храниться безопасно, а не просто открытым текстом."
 
-#: ../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 "Требует gnome-keyring и 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 "Возможность соединяться с серверами, использующими SRV записи."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Требует dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Требует nslookup для использования SRV записей."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Проверка орфографии"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Проверка орфографии набираемых сообщений"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires libgtkspell."
 msgstr "Требует библиотеку libgtkspell."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Notification"
 msgstr "Уведомления"
 
-#: ../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 "Требует python-notify или python-dbus совместно с notification-daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Иконка в системном трее"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Иконка в системном лотке отображающая текущий статус."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Требует python-gnome2-extras или скомпилированного модуля trayicon из "
 "исходных кодов Gajim."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Требует PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Авто статус"
 
-#: ../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 "Требует библиотеку libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Требует 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 "Преобразовывать LaTeX выражения, заключенные в $$ $$"
 
-#: ../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."
@@ -7425,7 +7461,7 @@ msgstr ""
 "Требует texlive-latex-base и dvipng. Необходимо присвоить пункту 'use_latex' "
 "значение «Активно» в Расширенном редакторе настроек."
 
-#: ../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."
@@ -7434,23 +7470,23 @@ msgstr ""
 "присвоить пункту 'use_latex' значение «Активно» в Расширенном редакторе "
 "настроек."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "End to end шифрование"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "Шифрование сообщений чата."
 
-#: ../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 "Требует python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Генератор RST"
 
-#: ../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)."
@@ -7458,23 +7494,23 @@ msgstr ""
 "Генерировать XHTML вывод из кода RST (см. http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../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 "Требует python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr "Кликабельные ссылки"
 
-#: ../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 "Требует python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Функции"
 
@@ -7495,7 +7531,7 @@ msgstr "Прогресс"
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
@@ -7512,7 +7548,7 @@ msgstr "Вы"
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
 #: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Получатель:"
@@ -7545,83 +7581,84 @@ msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Передача файла остановлена контактом на той стороне"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Передача остановлена"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Выбрать файл для отправки..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Описание: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Нет доступа к файлу"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: ../src/filetransfers_window.py:334 ../src/gtkgui_helpers.py:814
+#: ../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."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Что вы хотите сделать?"
 
 #. 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:360 ../src/gtkgui_helpers.py:825
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: ../src/filetransfers_window.py:360 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
-#: ../src/filetransfers_window.py:370
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Сохранить файл как..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:436
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7629,32 +7666,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:593 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Имя: "
 
-#: ../src/filetransfers_window.py:595 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Пауза"
 
@@ -7662,27 +7699,32 @@ msgstr "Пауза"
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim для запуска требуется X-сервер. Выход..."
 
-#: ../src/gajim.py:168
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim требуется PyGTK 2.12 или выше"
 
-#: ../src/gajim.py:169
+#: ../src/gajim.py:171
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется PyGTK 2.12 или выше. Выход..."
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:173
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim требуется GTK 2.12 или выше"
 
-#: ../src/gajim.py:172
+#: ../src/gajim.py:174
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется GTK 2.12 или выше. Выход..."
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У GTK отсутствует поддержка libglade."
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7690,20 +7732,20 @@ msgid ""
 msgstr ""
 "Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim для запуска требуется PySQLite2"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim для запуска требуется pywin32"
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7713,11 +7755,11 @@ msgstr ""
 "его на сайте: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:340
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim уже запущен"
 
-#: ../src/gajim.py:341
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7725,20 +7767,20 @@ msgstr ""
 "По-видимому, уже запущен другой экземпляр Gajim\n"
 "Запустить ещё один?"
 
-#: ../src/gajim.py:426
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/gajim.py:427
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
 
-#: ../src/gajim.py:441
+#: ../src/gajim.py:443
 msgid "GPG key expired"
 msgstr "Срок действия ключа GPG истёк"
 
-#: ../src/gajim.py:442
+#: ../src/gajim.py:444
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr ""
@@ -7746,15 +7788,15 @@ msgstr ""
 "использования OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:451
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/gajim.py:452
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7765,54 +7807,58 @@ msgstr ""
 "другим пользователем.\n"
 "Укажите другой ник:"
 
-#: ../src/gajim.py:529
+#: ../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 "Вы принимаете этот запрос?"
 
-#: ../src/gajim.py:531
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Вы принимаете запрос %s?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:585 ../src/notify.py:511
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: ../src/gajim.py:912 ../src/gajim.py:916
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Ошибка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:926 ../src/gajim.py:940
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:967 ../src/notify.py:513
+#: ../src/gajim.py:970 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: ../src/gajim.py:992
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:993
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gajim.py:1005
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» отозвал подписку с вами"
 
-#: ../src/gajim.py:1006
+#: ../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?"
@@ -7820,78 +7866,78 @@ msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: ../src/gajim.py:1031 ../src/notify.py:515
+#: ../src/gajim.py:1034 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: ../src/gajim.py:1072
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с «%s» не может быть установлена"
 
-#: ../src/gajim.py:1261 ../src/groupchat_control.py:1176
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
-#: ../src/gajim.py:1279 ../src/groupchat_control.py:1359
+#: ../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 теперь %(status)s"
 
-#: ../src/gajim.py:1346
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s установил(а) тему: %(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:1410 ../src/groupchat_control.py:1135
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
-#: ../src/gajim.py:1413
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Теперь в комнате отображается недоступный участник"
 
-#: ../src/gajim.py:1415
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: ../src/gajim.py:1418
+#: ../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:1421
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/gajim.py:1423
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Запись логов конференции выключена"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Конференция полностью анонимна"
 
-#: ../src/gajim.py:1463
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Чтобы войти в комнату %s, нужен пароль."
 
-#: ../src/gajim.py:1497
+#: ../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"
@@ -7899,19 +7945,19 @@ msgstr ""
 "Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
 "возвратил неверный пароль.\n"
 
-#: ../src/gajim.py:1499
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без ключа OpenPGP."
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:1525
+#: ../src/gajim.py:1528
 msgid "GPG key not trusted"
 msgstr "Ключ GPG не является доверенным"
 
-#: ../src/gajim.py:1525
+#: ../src/gajim.py:1528
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -7919,13 +7965,13 @@ msgstr ""
 "Ключ GPG используемый для шифрования не является доверенным. Вы "
 "действительно хотите зашифровать эти сообщения?"
 
-#: ../src/gajim.py:1527 ../src/gajim.py:2184 ../src/gajim.py:2219
-#: ../src/groupchat_control.py:1932 ../src/message_window.py:212
-#: ../src/roster_window.py:3897
+#: ../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 "Не _переспрашивать"
 
-#: ../src/gajim.py:1537
+#: ../src/gajim.py:1540
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -7933,12 +7979,12 @@ msgstr ""
 "Gnome Keyring установлен, но некорректно запущен (возможно неверно "
 "установлена переменная среды)"
 
-#: ../src/gajim.py:1647
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новое письмо на %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1649
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7946,7 +7992,7 @@ msgstr[0] "У вас есть %d непрочитанное письмо"
 msgstr[1] "У вас есть %d непрочитанных письма"
 msgstr[2] "У вас есть %d непрочитанных писем"
 
-#: ../src/gajim.py:1662
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7961,34 +8007,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1733
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gajim.py:1801
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Удаляет контакт из ростера"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Ошибка чтения файла:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1805
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gajim.py:1822
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gajim.py:1920
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7997,36 +8053,36 @@ msgstr ""
 "Не удалось расшифровать сообщение от %s\n"
 "Возможно, оно было испорчено."
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Сообщение не удалось расшифровать"
 
-#: ../src/gajim.py:2001
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gajim.py:2002
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: ../src/gajim.py:2014
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2027
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Ошибка."
 
-#: ../src/gajim.py:2063
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gajim.py:2064
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8034,11 +8090,11 @@ msgstr ""
 "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
 "другой ресурс"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Ошибка при проверке SSL сертификата"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8049,15 +8105,15 @@ msgstr ""
 "s\n"
 "Вы всё ещё хотите подключиться к этому серверу?"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: ../src/gajim.py:2149
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Ошибка SSL сертификата"
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8073,21 +8129,21 @@ msgstr ""
 "Новый отпечаток: %(new)s\n"
 "Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
 
-#: ../src/gajim.py:2180 ../src/gajim.py:2215
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: ../src/gajim.py:2181
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
 
-#: ../src/gajim.py:2183 ../src/gajim.py:2218
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: ../src/gajim.py:2216
+#: ../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?"
@@ -8095,27 +8151,27 @@ msgstr ""
 "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
 "(Установите PyOpenSSL, чтобы этого не происходило.)"
 
-#: ../src/gajim.py:2236
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP узел не был удален"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP узел %(node)s не был удален: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2731 ../src/gajim.py:2753
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Смайлики выключены"
 
-#: ../src/gajim.py:2732
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: ../src/gajim.py:2754
+#: ../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 "
@@ -8124,13 +8180,13 @@ msgstr ""
 "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
 "emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2780 ../src/roster_window.py:3381
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Вы не можете зайти в комнату, так как вы в режиме невидимости."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3059
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
@@ -8164,12 +8220,12 @@ msgstr ""
 "строке"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:232 ../src/gajim-remote.py:243
-#: ../src/gajim-remote.py:259 ../src/gajim-remote.py:269
+#: ../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:273
 msgid "account"
 msgstr "Учетные записи"
 
@@ -8195,8 +8251,9 @@ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:157
+#: ../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 "сообщение"
 
@@ -8221,11 +8278,15 @@ msgstr "Показывает окно беседы, чтобы вы могли �
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакта, с которым вы хотели бы побеседовать"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "если указано, контакт будет взят из контакт-листа этой учетной записи"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8235,31 +8296,31 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:146
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "содержимое сообщения"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "PGP ключ"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr ""
 "если указано, сообщение будет зашифровано с использованием открытого ключа"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr ""
 "если указано, сообщение будет отправлено с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8269,205 +8330,210 @@ msgstr ""
 "учетная запись опциональны. Если вы хотите настроить лишь 'учетную запись', "
 "без 'ключа OpenPGP', просто установите 'ключ OpenPGP' в ''."
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "тема сообщения"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Отправляет новые сообщения в комнату, к которой вы присоединились."
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID контакта, который получит сообщение"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Получает детальную информацию о контакте"
 
-#: ../src/gajim-remote.py:165 ../src/gajim-remote.py:178
-#: ../src/gajim-remote.py:208 ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID контакта"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Получает детальную информацию о учетной записи"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Имя учетной записи"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Отправляет контакту файл"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Путь до файла"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr ""
 "если указано, файл будет отправлен с использованием этой учетной записи"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Показывает все параметры с их значениями"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Присваивает 'ключу' в 'значение'"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ключ' это название параметра, а 'значение' это то, что ему присваивают"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Удаляет параметр"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "имя параметра, который нужно удалить"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Сохраняет текущее состояние настроек Gajim в файл .config"
 
-#: ../src/gajim-remote.py:206
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Добавляет контакт в ростер"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Добавляет новый контакт для данной учетной записи"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущий статус (по умолчанию глобальный, если не указана учетная "
 "запись)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Возвращает текущее сообщение о статусе (по умолчанию глобальное, если не "
 "указана учетная запись)"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Возвращает количество непрочитанных сообщений"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Открыть диалог «Начать беседу»"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Начать беседу с этой учетной записи"
 
-#: ../src/gajim-remote.py:247
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Отправляет произвольный XML"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "Отправляемый XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "Учётная запись, из которой будет отправлен XML."
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработать ссылку формата «xmpp:/»"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI для обработки"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Учетная запись, в которой вы хотите его использовать"
 
 #: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "содержимое сообщения"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Присоединиться к комнате MUC"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "комната"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID комнаты"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "Ник"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Используемый ник"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "Пароль:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Пароль для входа в комнату"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: ../src/gajim-remote.py:305
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: ../src/gajim-remote.py:324
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8476,15 +8542,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: ../src/gajim-remote.py:379
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: ../src/gajim-remote.py:402
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8493,16 +8559,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8511,7 +8577,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:479
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8520,7 +8586,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:484
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8529,7 +8595,7 @@ msgstr ""
 "Аргумент «%(arg)s» не задан. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Неверный хост"
 
@@ -8546,15 +8612,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Создайте новую тему с желаемым названием."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "имя тeмы"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Вы не можете удалить вашу текущую тему"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Выберите сначала другую тему."
 
@@ -8568,122 +8634,116 @@ msgstr "Не удалось отправить личное сообщение"
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "Вы больше не находитесь в комнате «%(room)s» или «%(nick)s» вышел."
 
-#: ../src/groupchat_control.py:410
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: ../src/groupchat_control.py:562
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: ../src/groupchat_control.py:564
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(who)s выгнал %(nick)s из комнаты: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1164
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1174 ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1216
-#: ../src/groupchat_control.py:1221
+#: ../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 выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "выключение системы"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s ранг %(affiliation)s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1319
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(actor)s присвоил %(nick)s обязанности %(role)s"
 
-#: ../src/groupchat_control.py:1323
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:1357
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1472 ../src/groupchat_control.py:1802
-msgid "Invalid nickname"
-msgstr "Неверное имя пользователя"
-
-#: ../src/groupchat_control.py:1497 ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:1531
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "У этой комнаты нет темы"
 
-#: ../src/groupchat_control.py:1543
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Пригласил(а) %(contact_jid)s в %(room_jid)s."
@@ -8697,19 +8757,19 @@ msgstr ""
 
 #. We can't do the difference between nick and reason
 #. So we don't say the nick
-#: ../src/groupchat_control.py:1614 ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_control.py:1638
+#: ../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:1721
+#: ../src/groupchat_control.py:1728
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8721,7 +8781,7 @@ msgstr ""
 "момент находится в комнате, то он/она/оно также будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_control.py:1727
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8729,7 +8789,7 @@ msgid ""
 msgstr ""
 "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_control.py:1733
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8738,7 +8798,7 @@ msgstr ""
 "Использование: /%s [причина], закрывает текущее окно или вкладку, приводя "
 "причину, если она указана."
 
-#: ../src/groupchat_control.py:1739
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8747,7 +8807,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_control.py:1743
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8756,7 +8816,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает подключиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_control.py:1747
+#: ../src/groupchat_control.py:1754
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8765,7 +8825,7 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_control.py:1755
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8774,23 +8834,23 @@ msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно личной беседы и "
 "отсылает сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_control.py:1760
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_control.py:1764
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Использование: /%s, показывает список присутствующих в комнате."
 
-#: ../src/groupchat_control.py:1768
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_control.py:1771
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8798,54 +8858,54 @@ msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:1781
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
 "messages."
 msgstr "Использование: /%s <ник>, запретить <ник> отправлять вам сообщения."
 
-#: ../src/groupchat_control.py:1777
+#: ../src/groupchat_control.py:1784
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 "messages."
 msgstr "Использование: /%s <ник>, разрешить <ник> отправлять вам сообщения."
 
-#: ../src/groupchat_control.py:1926
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты «%s»?"
 
-#: ../src/groupchat_control.py:1928
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1965
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: ../src/groupchat_control.py:1966
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: ../src/groupchat_control.py:1970
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: ../src/groupchat_control.py:1971
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
 # смотря где вылазит меседж - нужно присмотреться
 #. Ask for a reason
-#: ../src/groupchat_control.py:1998
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: ../src/groupchat_control.py:1999
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8853,22 +8913,22 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: ../src/groupchat_control.py:2001
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2172
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:2173 ../src/groupchat_control.py:2478
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2477
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -9129,18 +9189,18 @@ msgstr "Игнорировать"
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2825
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2828
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2830 ../src/roster_window.py:2841
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
@@ -9171,46 +9231,46 @@ msgid ""
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:961
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:1892
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1926
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1952
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG использовать невозможно"
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3325
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3326
+#: ../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?"
@@ -9218,27 +9278,27 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2231
+#: ../src/roster_window.py:2240
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: ../src/roster_window.py:2232
+#: ../src/roster_window.py:2241
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: ../src/roster_window.py:2233
+#: ../src/roster_window.py:2242
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: ../src/roster_window.py:2324 ../src/roster_window.py:2561
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9246,16 +9306,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2562
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2565
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: ../src/roster_window.py:2566
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9263,11 +9323,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:2569
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9277,57 +9337,57 @@ msgstr ""
 "транспорты:%s."
 
 #. it's jid
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:2713
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:2771
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:2772
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:2773
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:2812
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: ../src/roster_window.py:2813
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3165
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Вы собираетесь удалить «%(name)s» (%(jid)s) из вашего списка контактов.\n"
 
-#: ../src/roster_window.py:3170
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9336,11 +9396,11 @@ msgstr ""
 "не сможет видеть ваш статус."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3176
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3179
+#: ../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."
@@ -9348,16 +9408,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3186
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9367,20 +9427,20 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: ../src/roster_window.py:3247
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3248
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:3804
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3806
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9388,12 +9448,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
 "следующем подключении."
 
-#: ../src/roster_window.py:3891
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3893
+#: ../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 "
@@ -9403,11 +9463,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:4006
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:4017
+#: ../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:"
@@ -9415,12 +9475,12 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: ../src/roster_window.py:4122
+#: ../src/roster_window.py:4131
 #, python-format
 msgid "Send %s to %s"
 msgstr "Отправить %s контакту %s"
 
-#: ../src/roster_window.py:4128
+#: ../src/roster_window.py:4137
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
@@ -9430,115 +9490,115 @@ msgstr "Обьединить %s и %s в метаконтакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4711 ../src/roster_window.py:4782
-#: ../src/roster_window.py:4791 ../src/systray.py:216 ../src/systray.py:263
+#: ../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 "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:4798
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:4803
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:4840 ../src/systray.py:279
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4900
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4956 ../src/roster_window.py:5057
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:4991
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
 #. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5679
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5699
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
 #. Send single message
-#: ../src/roster_window.py:5760
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5816
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
-#: ../src/roster_window.py:5898
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:5905
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Выйти"
 
-#: ../src/roster_window.py:5985
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "В _новую комнату"
 
 #. History manager
-#: ../src/roster_window.py:6098
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:6264
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
@@ -9559,16 +9619,16 @@ msgstr "Нет результата"
 msgid "Disk WriteError"
 msgstr "Ошибка записи на диск"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:411 ../src/session.py:446
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Подтвердить данные настройки сеанса"
 
-#: ../src/session.py:413
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9583,7 +9643,7 @@ msgstr ""
 "\n"
 "\tПриемлемы ли эти настройки?"
 
-#: ../src/session.py:447
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9775,6 +9835,15 @@ msgstr "Нет ожидающего запроса на подписку."
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
+#~ msgid "B_OSH Port:"
+#~ msgstr "Порт B_OSH:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Показать _ростер"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Передача файла остановлена контактом на той стороне"
+
 #, fuzzy
 #~ msgid "Message Body"
 #~ msgstr "Сообщение"
diff --git a/po/sk.po b/po/sk.po
index 44307df37..24cf046af 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -4,17 +4,12 @@
 # Juraj Michalek <juraj.michalek@asinus.org>, 2005.
 # Pavol Klačanský <pavolzetor@gmail.com>, 2008, 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:53+0100\n"
-"PO-Revision-Date: 2009-02-22 10:18+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:04+0200\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
@@ -97,6 +92,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Prosím, vyberte 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"
@@ -104,53 +103,58 @@ msgstr ""
 "Pridať tento certifikát do zoznamu dôverných certifikátov.SHA1 odtlačok "
 "certifikátu:\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 "Použiť overenie"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Pripojiť, keď stlačím Dokončiť"
 
-#: ../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: Pomocník - Tvorba účtu"
 
-#: ../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 "Už mám účet a chcem ho po_užívať"
 
-#: ../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 "Chcem si za_registrovať nový účet"
 
-#: ../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 "Ak je zaškrtnuté, Gajim si zapamätá heslo pre tento účet"
 
-#: ../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 "Spravovať..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../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 "Uložiť hes_lo"
 
-#: ../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 "Nastaviť môj profil, keď som pripojený"
 
-#: ../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 "Použiť vlastný názov hostiteľa/portu"
 
-#: ../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."
@@ -158,42 +162,39 @@ msgstr ""
 "Potrebujete mať účet, aby ste sa mohli pripojiť\n"
 "do siete Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-msgid "Your JID:"
-msgstr "Vaše 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 "_Pokročilé"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Názov _hostiteľa:"
 
-#: ../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 "_Heslo:"
 
-#: ../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 "_Používateľské meno:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -225,17 +226,17 @@ msgid "Administration operations"
 msgstr "Administrátorské operácie"
 
 #: ../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 "Automaticky pripojiť, keď zlyhá spojenie"
 
 #: ../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 "Prip_ojiť sa pri štarte programu 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 "Zme_niť heslo"
 
@@ -251,22 +252,22 @@ msgstr ""
 "poskytované serverom. Pri povolení tejto vlastnosti bude TLS deaktivované."
 
 #: ../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 "Vybrať _kľúč..."
 
 #: ../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 "Kliknite pre zmenu hesla účtu"
 
 #: ../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 "Kliknite pre požiadavku autorizácie pre všetky kontakty z iného účtu"
 
 #: ../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 "Spojenie"
 
@@ -276,10 +277,10 @@ msgstr "Upraviť osobné informácie..."
 
 #. 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"
 
@@ -287,10 +288,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 "Všeobecné"
 
@@ -299,7 +300,7 @@ msgid "Hostname: "
 msgstr "Názov hostiteľa:"
 
 #: ../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."
@@ -308,7 +309,7 @@ msgstr ""
 "adries okrem vašej, takže je vyššia šanca, že prenos súborov bude fungovať."
 
 #: ../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"
@@ -325,7 +326,7 @@ msgstr ""
 "len pre vás"
 
 #: ../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"
@@ -334,7 +335,7 @@ msgstr ""
 "tento účet"
 
 #: ../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 "
@@ -344,13 +345,13 @@ msgstr ""
 "menu na spodku zoznamu) spôsobí zmenu stavu aj v tomto účte"
 
 #: ../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 "Informácie o vás sú uložené na serveri"
 
 #: ../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 "Žiadny kľúč nie je vybraný"
 
@@ -360,18 +361,19 @@ msgstr "Žiadny kľúč nie je vybraný"
 #. 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 "Žiadny"
 
 #: ../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 "Osobné informácie"
@@ -381,12 +383,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_ta:"
 
 #: ../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 "
@@ -397,7 +399,7 @@ msgstr ""
 "najvyššou priritou obdrží udalosť"
 
 #: ../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 "Priorita sa zmení automatický podľa stavu."
 
@@ -406,12 +408,12 @@ msgid "Proxy:"
 msgstr "Proxy:"
 
 #: ../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 "Z_droj:"
 
 #: ../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 "
@@ -430,7 +432,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Uložiť _heslo (nie je bezpečné)"
 
 #: ../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 "Uložiť _záznam z rozhovoru pre všetky účty"
 
@@ -439,13 +441,12 @@ msgid "Send keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia"
 
 #: ../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 "Synch_ronizovať stav účtu s globálnym stavom"
 
 #: ../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 "Synchronizovať kontakty"
@@ -455,7 +456,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Použiť _SSL (historické dôvody)"
 
 #: ../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 "Použiť proxy pre prenos súborov"
 
@@ -463,13 +464,8 @@ msgstr "Použiť proxy pre prenos súborov"
 msgid "_Adjust to status"
 msgstr "_Upraviť stav"
 
-#: ../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 "_Názov:"
 
@@ -486,7 +482,12 @@ msgstr "_Upraviť stav"
 msgid "Accounts"
 msgstr "Účty"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Použiť overenie"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -494,28 +495,28 @@ msgstr ""
 "Zaškrtnite toto, ak sa má Gajim pýtať pred poslaním vášho hesla cez "
 "nezabezpečené spojenie."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 #, fuzzy
 msgid "Co_nnect on Gajim startup"
 msgstr "Prip_ojiť sa pri štarte programu 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-mail:"
 
-#: ../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 "Prvé meno:"
 
-#: ../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 ""
 "Ak je zaškrtnuté, Gajim bude získavať heslo z GPG agenta podobného ako "
 "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"
@@ -525,95 +526,96 @@ msgstr ""
 "vlastný.\n"
 "Zoberte v úvahu aj prípadné nastavenie firewallu."
 
-#: ../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 "Posledné meno:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Z_lúčiť účty"
 
 #. 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 "Preme_novať"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 #, fuzzy
 msgid "Send _keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Synch_ronizovať stav účtu s globálnym stavom"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 #, fuzzy
 msgid "Use G_PG Agent"
 msgstr "Použit GPG _agenta"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Použiť vlastný názov hostiteľa/portu"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Použiť vlastný port:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Upraviť osobné informácie..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 #, fuzzy
 msgid "_Enable"
 msgstr "Povoliť"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Názov _hostiteľa:"
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 #, fuzzy
 msgid "_Manage..."
 msgstr "Spravovať..."
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
 #, fuzzy
 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 "V_arovať pred použitím nezabezpečeného spojenia"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 #, fuzzy
 msgid "_use HTTP__PROXY environment variable"
 msgstr "Použiť HTTP_PROXY premenu prostredia"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -799,7 +801,7 @@ msgid "All statuses"
 msgstr "Všetky stavy"
 
 #: ../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 "Preč"
 
@@ -816,7 +818,7 @@ msgid "Have "
 msgstr "Má"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Neviditeľný"
 
@@ -825,7 +827,7 @@ msgid "Launch a command"
 msgstr "Vykonať príkaz"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Neprítomný"
 
@@ -945,7 +947,7 @@ msgstr "Posledná zmena:"
 msgid "New entry received"
 msgstr "Prijatý nový záznam"
 
-#: ../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 "Dostali ste novú položku:"
 
@@ -989,11 +991,19 @@ msgstr "Vložte nové heslo:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Zadajte vašu novú správu o stave</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 "Aktivita:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Nálada:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Prednastavené správy:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Uložiť ako prednastavené..."
 
@@ -1053,11 +1063,11 @@ msgstr "_Pridať do zoznamu"
 
 #: ../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 "_História"
 
@@ -1199,7 +1209,7 @@ msgstr ""
 "Riadok s kontaktom\n"
 "Titulok diskusie"
 
-#: ../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 "Tučné"
 
@@ -1219,11 +1229,11 @@ msgstr "Úprava tém programu Gajim"
 msgid "Gone"
 msgstr "Minulé"
 
-#: ../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 "Neaktívny"
 
-#: ../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 "Kurzíva"
 
@@ -1271,7 +1281,7 @@ msgstr "Zmeniť _predmet..."
 msgid "Configure _Room..."
 msgstr "Nastaviť _miestnosť..."
 
-#: ../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 "Zálož_ky"
 
@@ -1303,23 +1313,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Zakázať"
 
-#: ../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 "_Blokovať"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Vykopnúť"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Člen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Poslať súkromnú správu"
 
-#: ../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 "_Odblokovať"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Hlas"
 
@@ -1327,13 +1351,13 @@ msgstr "_Hlas"
 msgid "Create new post"
 msgstr "Vytvoriť novú správu"
 
-#: ../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 "Od"
 
 #. 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 "Predmet"
 
@@ -1352,7 +1376,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Vitajte v Gajim správca histórie</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 "Odstrániť"
 
@@ -1405,7 +1430,7 @@ msgstr "Hľadať:"
 msgid "_Log conversation history"
 msgstr "Zaznamenávať históriu k_onverzácie"
 
-#: ../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 "Pripojiť sa k diskusnej skupine"
 
@@ -1432,8 +1457,8 @@ msgstr "Posledné:"
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../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 "_Pripojiť"
 
@@ -1461,7 +1486,7 @@ msgstr "Minimalizovať pri automatickom pripojení"
 msgid "Print status:"
 msgstr "Vypísať stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1491,11 +1516,6 @@ msgstr "<b>Nastavenia</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
 #, fuzzy
-msgid "B_OSH Port:"
-msgstr "_Port:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
-#, fuzzy
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1504,42 +1524,46 @@ msgstr ""
 "HTTP pripojenie\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Spravovať Proxy profily"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Použiť overenie"
 
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Typ:"
 
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Používateľské meno:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Pridať tento kontakt do zoznamu (Ctrl+D)"
@@ -1589,7 +1613,7 @@ msgstr "Zobraziť profil kontaktu (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 "_Poslať"
 
@@ -2000,7 +2024,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Usporiadať kontakty podľa stavu"
 
-#: ../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 "Stav"
 
@@ -2182,7 +2206,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Poradie:"
 
-#: ../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 "Súkromný zoznam"
 
@@ -2326,7 +2350,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titul pred:</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>Úloha:</b>"
 
@@ -2386,8 +2410,8 @@ msgstr "Odstrániť účet z Gajim aj zo _serveru"
 
 #. 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 "O_dstrániť"
 
@@ -2409,14 +2433,14 @@ msgstr "Upraviť _skupiny..."
 
 #. 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 "Vykonať príkaz..."
 
 #. 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 "Poz_vať do"
 
@@ -2426,7 +2450,7 @@ msgstr "O_dstrániť"
 
 #. 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 "Poslať vlas_tný stav"
 
@@ -2451,12 +2475,6 @@ msgstr "Začať _rozhovor"
 msgid "_Allow him/her to see my status"
 msgstr "_Povoliť jemu/jej vidieť môj stav"
 
-#: ../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 "_Blokovať"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
@@ -2478,16 +2496,34 @@ msgstr "_Premenovať..."
 msgid "_Subscription"
 msgstr "_Požiadavky"
 
-#: ../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 "_Odblokovať"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Neignorovať"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Pridať k_ontakt..."
@@ -2526,7 +2562,8 @@ msgid "Show _Offline Contacts"
 msgstr "Zobraziť _odhlásené kontakty"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2543,7 +2580,7 @@ msgstr "_Akcie"
 msgid "_Contents"
 msgstr "Ob_sah"
 
-#: ../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 "_Upraviť"
 
@@ -2584,11 +2621,11 @@ msgid "_Add contact"
 msgstr "_Pridať 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 "_Informácie"
 
-#: ../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 "_Hľadať"
 
@@ -2674,11 +2711,6 @@ msgstr "Požiadavka o zapísanie"
 msgid "_Deny"
 msgstr "_Zakázať"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-#, fuzzy
-msgid "Select the account with which to synchronise"
-msgstr "Zvoľte účet, s ktorým sa chcete synchronizovať"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Zvoľte účet, s ktorým sa chcete synchronizovať"
@@ -2703,10 +2735,6 @@ msgstr "Poslať krátku _správu"
 msgid "Show All Pending _Events"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Zobraziť _zoznam"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "S_tav"
@@ -2816,13 +2844,13 @@ msgstr "Prideliť Open_PGP kľúč"
 
 #. 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 "Upraviť _skupiny"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5759
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Premenovať"
 
@@ -2846,25 +2874,25 @@ msgstr "Zdroj:"
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Zrušiť potvrdenie"
 
-#: ../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 ""
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Služba zmenila identifikátor relácie."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr ""
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Služba zmenila identifikátor relácie."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu"
 
@@ -2889,7 +2917,7 @@ msgstr "Celočíselný"
 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 "Farba"
 
@@ -2914,174 +2942,197 @@ msgstr "(Žiadny)"
 msgid "Hidden"
 msgstr "Skryté"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Dostali ste novú položku:"
+
 #. 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 "Angličtina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Bieloruština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulharčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretónčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Čeština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Nemčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Gréčtina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Britština"
 
-#: ../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 "Španielčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskičtina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francúzština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Chorvátčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Taliančina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Nórčina (b)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Holandština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Nórčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Poľština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugalčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazílska portugalčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Ruština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Srbština"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovenčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Švédčina"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Čínština (Ch)"
 
-#: ../src/chat_control.py:345
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
 
 #. 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 "Pripojenie nie je dostupné"
 
-#: ../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 "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený."
 
-#: ../src/chat_control.py:751
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Neurčitý"
 
-#: ../src/chat_control.py:752
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Chorý"
 
-#: ../src/chat_control.py:775
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:784
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktné informácie"
 
-#: ../src/chat_control.py:1220 ../src/chat_control.py:1623
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Skutočne poslať súbor?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné Jabber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
 #. 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 "Nie je v zozname"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
+
+#: ../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 "Neznámy umelec"
 
-#: ../src/chat_control.py:1384 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Neznámy titulok"
 
-#: ../src/chat_control.py:1386 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Neznámy zdroj"
 
-#: ../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"
@@ -3090,101 +3141,92 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "z <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1395
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s od %(artist)s\n"
-"z %(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 z diskusnej skupiny %(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 ""
 
-#: ../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."
 msgstr "=="
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:1639
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1641
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Relácia NEBUDE zaznamenaná"
 
 #. encryption %s active
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1665
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "a NEoverený"
 
 #. 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"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1719
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../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 "Príkazy: %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 "Použitie: /%s, vyčistí textové okno."
 
-#: ../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 "Použitie: /%s, skryje tlačidlá rozhovoru."
 
-#: ../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 "
@@ -3193,77 +3235,77 @@ msgstr ""
 "Použitie: /%(command)s <akcia>, odošle akciu pre aktuálnu diskusnú skupinu. "
 "Použite tretiu osobu. (napr. /%(command)s explodoval.)"
 
-#: ../src/chat_control.py:1744
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Použitie: /%s, pošle ping kontaktu"
 
-#: ../src/chat_control.py:1747
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Použitie: /%s, pošle správu kontaktu"
 
-#: ../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 "Žiadne informácie s pomocou pre /%s"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: ../src/chat_control.py:1893
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1895
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:1900
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1902
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../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 "Nasledujúca správa NEbola šifrovaná"
 
-#: ../src/chat_control.py:1942
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Nasledujúca správa bola šifrovaná"
 
 #. %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 "Práve ste prijali novú správu od \"%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."
 msgstr ""
 "Ak zatvoríte túto kartu a máte deaktivovanú históriu, správa bude stratená."
 
-#: ../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 "Chyba databázy"
 
-#: ../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 "
@@ -3272,7 +3314,7 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/chat_control.py:2699
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
@@ -3281,23 +3323,23 @@ msgstr "%(name)s je teraz %(status)s"
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../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 je súbor ale mal byť priečinok"
 
-#: ../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 bude ukončený"
 
-#: ../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 je priečinok ale mal byť súbor"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "vytváram priečinok %s"
@@ -3361,9 +3403,9 @@ msgstr "Zvolte diskusné skupiny, ktoré chcete opustiť"
 
 #. 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 "Diskuné skupiny"
 
@@ -3379,68 +3421,68 @@ msgstr "Preposlať neprečítané správy"
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr ""
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Použiť D-Bus a Notification-Daemon pre zobrazenie upozornení"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Čas v minútach, po ktorých sa zmení stav na preč."
 
-#: ../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 (Preč ako výsledok nečinnosti viac ako $T minút)"
 
-#: ../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 "Čas v minútach, po ktorých sa zmení stav na neprítomný."
 
-#: ../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 (Neprítomný ako výsledok nečinnosti viac ako $T minút)"
 
-#: ../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 ""
 "Zoznam (oddelený medzerami) a riadkov (účet a skupina), ktoré sú zabalené."
 
 #. 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 "predvolená"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Povoliť link-local/zeroconf správy"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Jazyk pre kontrolu pravopisu"
 
-#: ../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"
@@ -3450,25 +3492,25 @@ msgstr ""
 "'sometimes' - zobraziť každých print_ichat_every_foo_minutes minút.\n"
 "'never' - nezobrazovať čas."
 
-#: ../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 "Použiť * / _ pár znakov ako možné formátovacie znaky."
 
-#: ../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 ""
 "Ak je pravda, neodstaňuj */_ .  Takže *abc* bude tečné a * * nebude "
 "odstránené."
 
-#: ../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/"
@@ -3479,7 +3521,7 @@ msgstr ""
 "sourceforge.net/docs/ref/rst/restructuredtext.html (Ak to chcete používať, "
 "nainštalujte docutils)"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3487,7 +3529,7 @@ msgstr ""
 "Znak použitý za prezývkou, keď sa používa automatické dopĺňanie (tab) v "
 "diskusnej skupine."
 
-#: ../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."
@@ -3495,26 +3537,26 @@ msgstr ""
 "Vaša prezývka sa zhoduje s inou prezývkou v diskusnej miestnosti aj po "
 "pripojení znaku."
 
-#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Znaky zobrazené za prezývkou v konverzáciách"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Znaky zobrazené pred prezývkou v konverzáciách"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../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."
@@ -3522,11 +3564,11 @@ msgstr ""
 "Koľko riadkov si pamätať z predchádzajúceho rozhovoru, keď bude karta/okno "
 "znovu otvorená."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Z koľkých minút majú byť riadky s predchádzajúcej konverzácie."
 
-#: ../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)."
@@ -3534,11 +3576,11 @@ msgstr ""
 "Poslať správu pri stlačení Ctrl+Enter a pri Enter spraviť nový riadok "
 "(chovanie podobné ako Mirabilis ICQ klient)"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koľko riadkov posunúť pri stlačení Ctrl+KP_hore."
 
-#: ../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' "
@@ -3547,12 +3589,12 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ak je zaškrtnuté, Gajim môže byť ovládaný na diaľku s použitím gajim-remote."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3563,20 +3605,20 @@ msgstr ""
 "účtov (nie je nutné, aby listen_to_network_manager bolo nastavené na False) "
 "podľa stavu sieťového pripojenia."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Posielanie informácii o stave diskusie. Môže byť nastavené na hodnotu all, "
 "composing_only, disabled."
 
-#: ../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."
@@ -3584,11 +3626,11 @@ msgstr ""
 "Pokiaľ sa čas pri každej správe (print_time==sometimes), vypíše sa každých x "
 "minút."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spýtať sa pred zatvorením okna/záložky pre diskusnú skupinu."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3596,7 +3638,7 @@ msgstr ""
 "Vždy sa spýtať pred zatvorením okna/záložky diskusnej skupiny, ktorej meno "
 "je uvedené v zozname diskusných JID."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3604,33 +3646,39 @@ msgstr ""
 "Nikdy sa nepýtať pred zatvorením karty/okna pre diskusnú skupinu, ktorej "
 "meno je uvedené v zozname JID."
 
-#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamená KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Upozorňovať na udalosti v oblasti systémových upozornení."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať kartu len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr ""
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v karte?"
 
-#: ../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 "
@@ -3638,16 +3686,16 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Predbežné zobrazenie nových správ vo vyskakovacom upozornení."
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "Bodkočiarkou oddelený zoznam slov bude zvýraznený v diskusnej skupine."
 
-#: ../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."
@@ -3655,14 +3703,14 @@ msgstr ""
 "Ak je pravda, Gajim skončí keď bude X tlačidlo vo Window manažéri stlačené. "
 "Toto nastavenie je použíté, len v prípade, že sa používa trayikona."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ak je pravda, Gajim bude kontrolovať pri každom štarte, či je štandartný "
 "klient."
 
-#: ../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."
@@ -3670,7 +3718,7 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí ikonku na každej záložke obsahujúcej neprečítané "
 "správy. Závisí na téme, ikonka môže byť animovaná."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3678,11 +3726,11 @@ msgstr ""
 "Ak je pravda, Gajim zobrazí stavovú správu v zozname kontaktov, za "
 "predpokladu, že táto správa nie je prázdna."
 
-#: ../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."
@@ -3690,7 +3738,7 @@ msgstr ""
 "Ak je pravda, Gajim si vyžiada avatara, pre každý kontakt, ktorý nemá "
 "avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3698,7 +3746,7 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť informáciu o zmene stavu kontaktu a jeho/"
 "jej stavovú správu"
 
-#: ../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 "
@@ -3707,28 +3755,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 "Farba pozadia použitá pri prihlásení kontaktu."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Farba pozadia použitá pri odhlásení kontaktu."
 
-#: ../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 "Ak je pravda, obnovené správy budú zobrazené menším písmom."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazovať avatarov pre transport."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazovať zoznam v paneli úloh."
 
-#: ../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 "
@@ -3738,7 +3786,7 @@ msgstr ""
 "2.8, potom bude okno blikať (bežné správanie pre väčšinu okenných "
 "manažérov), keď sa udeje nejaká udalosť."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3749,7 +3797,7 @@ msgstr ""
 "informácie o prítomnosti v diskusnej skupine."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3769,31 +3817,31 @@ msgstr ""
 "'pertype' - Každý typ správy (napr., rozhovory proti diskusiám) sú odoslané "
 "do špecifikovaného okna."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ak nie je pravda, neuvidíte avatarov v diskusnom okne"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ak je pravda, stlačením Esc klávesy zatvoríte kartu/okno."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Skývať tlačidlá v okne rozhovoru."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Skrývanie titulku v okne s diskusnou skupinou"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryť titulok v okne s diskusiou dvoch osôb."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skrývanie zoznamu účastníkov v okne s diskusnou skupinou."
 
-#: ../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."
@@ -3801,15 +3849,15 @@ msgstr ""
 "V rozhovore sa zobrazí prezývka na začiatku riadku, len v prípade, že "
 "predchádzajúca správa prišla od inej osoby."
 
-#: ../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
 msgid "Smooth scroll message in conversation window"
 msgstr ""
 
-#: ../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 "
@@ -3817,13 +3865,13 @@ msgid ""
 msgstr ""
 "Zoznam farieb, ktoré budú použité na zafarbenie prezývok v diskusnej skupine."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab vás presunie na ďalšiu kartu, pokiaľ už nie sú žiadne neprečítané "
 "správy."
 
-#: ../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."
@@ -3831,14 +3879,14 @@ msgstr ""
 "Má byť zobrazovaný dialóg pri vytváraní metakontaktov? Prázdny reťazec "
 "znamená, že dialóg sa nezobrazuje."
 
-#: ../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."
@@ -3846,7 +3894,16 @@ msgstr ""
 "Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
 "ukladanie hesiel."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Ak je pravda, Gajim bude používať Správca zväzku kľúčov (ak je prítomný) na "
+"ukladanie hesiel."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3854,13 +3911,13 @@ msgstr ""
 "Ak je pravda, Gajim bude zobrazovať počet prítomných a všetkých kontaktov v "
 "riadku účtu a skupiny."
 
-#: ../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."
@@ -3868,17 +3925,17 @@ msgstr ""
 "Ak je pravda, Gajim naroluje a označí kontakt, ktorý poslal poslednú správu, "
 "ak nie je práve otvorené okno rozhovoru."
 
-#: ../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 "Doba neaktivity potrebná na zmenenie stavu na zatvoril okno."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3886,29 +3943,35 @@ msgstr ""
 "Maximálny počet riadkov zobrazených v rozhovore. Najstaršie riadky budú "
 "zmazané."
 
-#: ../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 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."
@@ -3916,60 +3979,68 @@ msgstr ""
 "Priorita sa zmení automaticky vzhľadom k vášmu stavu. Priority sú definované "
 "v premenných autopriority_* nastaveniach."
 
-#: ../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 "Ak je povolené, obnoví sa naposledy použitý stav."
 
-#: ../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 "Povoliť šifrovanie ESessions pre tento účet."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Má Gajim automaticky spúšťať šifrovanú reláciu keď je to možné?"
 
-#: ../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 "Zobraziť upozornenie pred poslaním hesla cez plaintext spojenie."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Zobraziť upozornenie pred použitím štandardnej SSL knižnice."
 
-#: ../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 ""
 
-#: ../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."
@@ -3977,25 +4048,25 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim použije vašu IP adresu a proxy definovanú v "
 "premennej file_transfer_proxies na prenos súborov."
 
-#: ../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 "Má tento kontakt k dispozícii OpenPGP?"
 
-#: ../src/common/config.py:406
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4003,199 +4074,199 @@ msgstr ""
 "Mal by sa Gajim spúšťať automaticky so šifrovanou reláciou pre tento kontakt "
 "keď je to možné?"
 
-#: ../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 "Jazyk v ktorom má byť prevádzaná kontrola pravopisu"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "všetky alebo medzerou oddelené stavy"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'áno', 'nie', alebo 'oboje'"
 
-#: ../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 "'áno', 'nie' alebo ''"
 
-#: ../src/common/config.py:431 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../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 "Pozerám film."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Telefonujem."
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Som vonku a užívam si život."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Prítomný."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Mám čas na rozhovor."
 
-#: ../src/common/config.py:443 ../src/config.py:1404
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Za chvíľu som späť."
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Nie som prítomný."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Nerušiť."
 
-#: ../src/common/config.py:446 ../src/common/config.py:447
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Ahoj!"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Prehrať zvuk keď príde nejaká MUC správa."
 
-#: ../src/common/config.py:467 ../src/common/optparser.py:235
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:471 ../src/common/optparser.py:221
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "námornícka"
 
-#: ../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 "Nie je možné nahrať 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 "Nesprávny hostiteľ"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Neplatná miestna adresa? :-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 "Redistračné informácie pre službu %s nedorazili včas"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:684
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Registrovať na %s"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:685
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 #, fuzzy
 msgid "Registration failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../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"
 msgstr ""
 
-#: ../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 "Chyba pri zápise na disk"
 
-#: ../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 "Neviditeľnosť nie je podporovaná"
 
-#: ../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 "Účet %s nepodporuje neviditeľnosť."
 
-#: ../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 "Nesprávné 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
 #, fuzzy, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4204,78 +4275,77 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/common/connection_handlers.py:2080
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Prezývka nie je povolená: %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 "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2162
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: ../src/common/connection_handlers.py:2165
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
 
-#: ../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 "Nie ste v zozname členov v skupinovej diskusii %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
 msgid "Room has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: ../src/common/connection_handlers.py:2218
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2245
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
 #. 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 "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:2268
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:2270
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %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 "
@@ -4286,15 +4356,15 @@ msgstr ""
 "odstránenie"
 
 #. 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 "OpenPGP passfráza nebola zadaná"
 
 #. %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 "Budete pripojený k %s bez OpenPGP."
@@ -4427,79 +4497,79 @@ msgstr ""
 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 "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:272
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:283
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s odpovedal zle na požiadavku o registráciu: %(error)s"
 
-#: ../src/common/connection.py:317
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transport %(name)s odpovedal nesprávne pri odoslaní registračnej požiadavky: "
 "%(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 "Nie je možné pripojiť sa k \"%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 "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:635
+#: ../src/common/connection.py:645
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Uložené do: %s"
 
-#: ../src/common/connection.py:648
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../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 "Nie je možné pripojiť sa k účtu %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 "Spojenie s účtom \"%s\" bolo stratené. Zopakuje sa pripájanie."
 
-#: ../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"
@@ -4508,7 +4578,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4517,24 +4587,24 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../src/common/connection.py:756
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:783
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:844
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../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 "
@@ -4543,30 +4613,30 @@ msgstr ""
 "Súkromný zoznam %s nebol odstránený. Možno je používaný jedným z vašich "
 "pripojených zdrojov. Deaktivujte ho a skúste to znovu."
 
-#: ../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 "Nie je možné poslať prázdne súbory"
 
-#: ../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 "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
 
 #. 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 "[Táto správa je *šifrovaná* (Pozrite :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"
@@ -4575,20 +4645,30 @@ msgstr ""
 "Predmet: %(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 "Pozvať _kontakty"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nie je možné získať, pretože aktuálny stav je: Neviditeľný"
 
-#: ../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 "Pozorovatelia"
 
 #: ../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 "Transporty"
 
@@ -4597,11 +4677,11 @@ msgid "Not in roster"
 msgstr "Nie je v zozname"
 
 #. 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 väzby chýbajú na tomto počítači"
 
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus vlastnosti programu Gajim nemôžu byť použité"
 
@@ -4631,356 +4711,356 @@ msgstr ""
 "Session bus nie je k dispozícii.\n"
 "Viac informácií nájdete na adrese http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dvanásť"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "jeden"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dva"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "štyri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "päť"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "šesť"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sedem"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "osem"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "deväť"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "desať"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "jedenásť"
 
+#. 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 "dvanásť"
-
-#. 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 hodín"
+msgid "%(0)s o'clock"
+msgstr "%(0)s hodín"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "päť po $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "päť po %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "desať po $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "desať po %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "štvrť po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "štvrť po %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "dvadsať po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "dvadsať po %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "dvadsaťpäť po $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "dvadsaťpäť po %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "pol $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "pol %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dvadsaťpäť do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "dvadsaťpäť do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dvadsať do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "dvadsať do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "štvrť do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "štvrť do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "desať do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "desať do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "päť do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "päť do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 hodina"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s hodina"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noc"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Skoré ráno"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Ráno"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Takmer poludnie"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Obed"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Popoludnie"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Večer"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "neskorý večer"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Začiatok týždňa"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Stred týždňa"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Koniec týždňa"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "P_reč"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "píše správu..."
 
 #. 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 "prestal písať správu"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
 #. 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"
@@ -4988,22 +5068,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: ../src/common/helpers.py:1102
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " z miestnosti %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 " od používateľa %s"
 
-#: ../src/common/helpers.py:1107
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " od %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"
@@ -5011,7 +5091,7 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#: ../src/common/helpers.py:1154
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5021,656 +5101,661 @@ msgstr "Gajim - %s"
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "azúrová"
 
-#: ../src/common/optparser.py:347
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr ""
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, fuzzy, python-format
 msgid "XMPP account %s@%s"
 msgstr "účtu %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Vystrašený"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Prekvapený"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Zamilovaný"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Nahnevaný"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Mrzutý"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Znepokojený"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Vyburcovaný"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Zahanbený"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Znudený"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Statočný"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Pokojný"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Opatrný"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Podchladený"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Sebaistý"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Zmätený"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Hĺbavý"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Spokojný"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Rozhádzaný"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Bláznivý"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Tvorivý"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Zvedavý"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Deprimovaný"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Skľúčený"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Sklamaný"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Znechutený"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Zhrozený"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Zmätený"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Rozpačitý"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Zavistlivý"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Vzrušený"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Koketný"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustrovaný"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Príjemný"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Trúchliaci"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Podráždený"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Previnilý"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Nádejný"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Prehriaty"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Ponížený"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Porazený"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Hladný"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Zranený"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Ohromený"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Rešpektovaný"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Zaľúbený"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Rozhorčený"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Zainteresovaný"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Opitý"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Nepremožiteľný"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Žiarlivý"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Osamelý"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Stratený"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Šťastný"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Protivný"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Náladový"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nervózny"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Neutrálny"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Urazený"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Pobúrený"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Hravý"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Hrdý"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Odpočinutý"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Odľahčený"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Kajajúci"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Neposedný"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Smutný"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Uštipačný"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Spokojný"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Vážny"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Šokovaný"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Hanblivý"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Chorý"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Ospanlivý"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Spontánny"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Vystresovaný"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Silný"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Prekvapený"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Vďačný"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Smädný"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Unavený"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Neurčitý"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Slabý"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Ustarostený"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Domáce práce"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Kupujem potraviny"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Čistím"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Varím"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Robím údržbu"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Umývam riad"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Periem"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Záhradničím"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Na obchôdzke"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Venčím psa"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Pijem pivo"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Pijem kávu"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Pijem čaj"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Desiatujem"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Raňajkujem"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Večeriam"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Obedujem"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Bicyklujem"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "Čistím"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Klusám"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Športujem"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Bežím"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Lyžujem"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Plávam"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Posilňujem"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Starám sa o seba"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "V kúpeloch"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Čistím si zuby"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "V kaderníctve"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Holím sa"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Kúpem sa"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Sprchujem sa"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Na schôdzke"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Koniec dňa"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Som vonku"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "Na dovolenke"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "Žúrujem"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Plánovaná dovolenka"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "Pijem"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Oddychujem"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "Som na túre"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Hrám sa"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Som vonku"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Žúrujem"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Čítam"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Nacvičujem"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Nakupujem"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "Lyžujem"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Mám spoločnosť"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Opalujem sa"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Sledujem TV"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Sledujem film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Rozprávam"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "Bezprostredne"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Telefonujem"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Mám videohovor"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Cestujem"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Prichádzam"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Šoférujem"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "V aute"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "V autobuse"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "V lietadle"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "Vo vlaku"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "Na výlete"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Prechádzam sa"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Kódim"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "Na stretnutí"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Študujem"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Píšem"
 
@@ -5703,16 +5788,16 @@ msgid ""
 "not valid, so ignored."
 msgstr ""
 
-#: ../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 ""
 "Pre pokračovanie odosielania a prijímania správ, sa musíte znovu pripojiť."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5721,31 +5806,31 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Prosím skontrolujte, či je nainštalovaný program Avahi alebo Bonjour."
 
-#: ../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 "Nie je možné spustiť lokálnu službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť 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 "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: ../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 "Nie je možné zmeniť stav účtu \"%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."
@@ -5754,58 +5839,50 @@ msgstr ""
 "odoslať."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Vašu správu nie je možné odoslať."
 
 #. 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 "Kontakt je odhlásený. Vašu správu nie je možné odoslať."
 
-#: ../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 ""
 "Spojenie na hostiteľa nie je možné vytvoriť: Vypršal časový limit pri "
 "odosielaní dát."
 
-#: ../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 "Chyba pri pridávaní služby. %s"
 
-#: ../src/config.py:151 ../src/config.py:602
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Zakázané"
 
-#: ../src/config.py:392
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Predvolená správa"
 
-#: ../src/config.py:399
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Povolené"
 
-#: ../src/config.py:441
-msgid "Always use OS/X default applications"
-msgstr "Vždy použiť štandartné aplikácie OS/X"
-
-#: ../src/config.py:442
-msgid "Custom"
-msgstr "Vlastný"
-
-#: ../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 "Slovník pre jazyk %s nie je k dispozícii"
 
-#: ../src/config.py:669
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5815,212 +5892,212 @@ msgstr ""
 "pravopisu, prípadne si môžete zvoliť iný jazyk na kontrolu pravopisu "
 "nastavením premennej setting the speller_language."
 
-#: ../src/config.py:1046
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "text správy o stave"
 
 #. 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 "Meno"
 
-#: ../src/config.py:1412
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Prihlásiť znovu?"
 
-#: ../src/config.py:1413
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ak chcete, aby boli všetky zmeny naraz aplikované, musíte sa znovu prihlásiť."
 
-#: ../src/config.py:1538 ../src/config.py:1639
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1675 ../src/config.py:1718
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
 
-#: ../src/config.py:1676
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Prečítať všetky správy pred odstránením tohoto účtu."
 
-#: ../src/config.py:1702
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: ../src/config.py:1703
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Všetky okná s diskusiami a diskusnými skupinami budú zatvorené. Prajete si "
 "pokračovať?"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
-#: ../src/config.py:1715
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1719
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "Pre zmenu názvu účtu, musíte mať prečítané všetky čakajúce správy."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už použitý"
 
-#: ../src/config.py:1726
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Tento názov je už použitý jedným z vašich účtov. Prosím, zvoľte si iný názov."
 
-#: ../src/config.py:1730 ../src/config.py:1734
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1735
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1810
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:1811
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:1838
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2028 ../src/config.py:3177
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../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 "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2050
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2051
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Vznikol problém pri získavaní vášho OpenPGP tajného kľúča."
 
-#: ../src/config.py:2086
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť meniť vaše osobné "
 "informácie."
 
-#: ../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 "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2107
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2108
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumožňuje uloženie vašich osobných informácií."
 
-#: ../src/config.py:2139
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2140
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Prosím, premenujte alebo odstráňte to pred zapnutím link-local správ."
 
-#: ../src/config.py:2323
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2325
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2361
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2363
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2364
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. 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 "Dôvod"
 
-#: ../src/config.py:2430
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2436
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2463
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. 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"
@@ -6028,11 +6105,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2467
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2468
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6040,11 +6117,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2471
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6052,17 +6129,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2474
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2475
+#: ../src/config.py:2500
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6079,86 +6156,90 @@ msgstr ""
 "4. doména (doména sama o sebe, ľubovoľný používateľ@doména,\n"
 "doména/zdroj, alebo adresa obsahujúca subdoménu."
 
-#: ../src/config.py:2572
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../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 "Heslo je požadované"
 
-#. ('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 "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2596 ../src/gajim.py:1569
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2606
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:2703
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:2704
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:2772
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Prosim, uistite sa, že je vyplnená položka server a miestnosť alebo "
 "odstráňte túto záložku."
 
-#: ../src/config.py:3088
-msgid "Invalid username"
-msgstr "Nesprávne meno používateľa"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Neplatná prezývka"
 
-#: ../src/config.py:3090
-msgid "You must provide a username to configure this account."
-msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Prezývka nie je povolená: %s"
 
-#: ../src/config.py:3116
-msgid "Duplicate Jabber ID"
-msgstr "Dvojité Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Neplatný server"
 
-#: ../src/config.py:3117
-msgid "This account is already configured in Gajim."
-msgstr "Tento účet už nastavný v Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Nesprávny záznam"
 
-#: ../src/config.py:3134
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3135 ../src/config.py:3326
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6167,24 +6248,32 @@ msgstr ""
 "Môžete nastaviť pokročilé vlastnosti účtu stlačením tlačidla Pokročilé, "
 "alebo neskôr zvolením položky Účty v menu Upraviť v hlavnom okne."
 
-#: ../src/config.py:3153
-msgid "Invalid server"
-msgstr "Neplatný server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Váš nový účet bol úspešne vytvorený"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Musíte vložiť meno používateľa pre konfuguráciu tohoto účtu."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3205 ../src/gajim.py:2102
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../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 "Tento certifikát je práve v súbore %s, preto nebude znova pridaný."
 
-#: ../src/config.py:3274
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6199,7 +6288,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../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"
@@ -6210,74 +6299,70 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\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 "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3325
-msgid "Your new account has been created successfully"
-msgstr "Váš nový účet bol úspešne vytvorený"
-
-#: ../src/config.py:3430
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3431
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/config.py:3584
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:3592
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:3627
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:3628
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:3630
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:3631
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:3632
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:3633
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:3634
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:3635
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:3636
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
-#: ../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
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6285,69 +6370,74 @@ msgstr ""
 "Zatiaľ čo ste nevenovali pozornosť tejto diskusnej skupine, pribudol "
 "nasledujúci text, ktorý je pod čiarou"
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Koniec"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcie pre \"%s\""
 
-#: ../src/conversation_textview.py:701
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Vyhľadať to v _slovníku"
 
-#: ../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 slovníku chýba \"%s\" a to nie je 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 pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:745
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Otvoriť ako _odkaz"
 
-#: ../src/conversation_textview.py:1199
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Včera"
 
 #. 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 "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1237
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber Id je už v zozname"
 
-#: ../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 "nové@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 "nové%d@jabber.id"
@@ -6370,136 +6460,136 @@ msgstr "Skupina"
 msgid "In the group"
 msgstr "V skupine"
 
-#: ../src/dialogs.py:276
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "ID kľúča"
 
-#: ../src/dialogs.py:281
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Meno kontaktu"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Nastaviť náladu"
 
-#: ../src/dialogs.py:545
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s správa o stave"
 
-#: ../src/dialogs.py:547
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Správa o stave"
 
-#: ../src/dialogs.py:659
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Prepísať správu o stave?"
 
-#: ../src/dialogs.py:660
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Tento názov je už použitý. Chcete prepísať túto správu o stave?"
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Uložiť ako prednastavenú správu o stave"
 
-#: ../src/dialogs.py:670
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Zadajte prosím názov pre túto stavovú správu"
 
-#: ../src/dialogs.py:676
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:677
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG číslo:"
 
-#: ../src/dialogs.py:678
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ číslo:"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../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 "Prosím vyplňte údaje o kontakte, ktorý chcete pridať do účtu %s"
 
-#: ../src/dialogs.py:718
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontakte, ktorý chcete pridať"
 
-#: ../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 "Nespravné ID používateľa"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ID používateľa nesmie obsahovať zdroj."
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Nemôžete pridať seba do vášho zoznamu kontaktov."
 
-#: ../src/dialogs.py:901
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt je už v zozname"
 
-#: ../src/dialogs.py:902
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt je už uvedený v zozname."
 
-#: ../src/dialogs.py:938
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
-#: ../src/dialogs.py:997
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "Verzia GTK+:"
 
-#: ../src/dialogs.py:998
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "Verzia PyGTK:"
 
-#: ../src/dialogs.py:1008
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Súčasní vývojári:"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Bývalí vývojári:"
 
-#: ../src/dialogs.py:1016
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "POĎAKOVANIE:"
 
 #. 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 "V neposlednom rade ďakujeme všetkým správcom balíkov."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Juraj Michálek (juraj.michalek AT asinus.org)\n"
 "Peter Trško (dogmat AT dogmat.us)\n"
 "Pavol Klačanský <pavol@klacansky.com>"
 
-#: ../src/dialogs.py:1197
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6508,88 +6598,88 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../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 "Prezývka obsahuje nepovolené znaky."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %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 "Už ste v diskusnej skupine %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásený."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1455
-#: ../src/groupchat_control.py:1738
-msgid "The nickname has not allowed characters."
-msgstr "Prezývka obsahuje nepovolené znaky."
-
-#: ../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
 msgid "Invalid group chat Jabber ID"
 msgstr "Nesprávne Jabber ID diskusnej skupiny"
 
-#: ../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
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskusnej skupiny obsahuje nepovolené znaky."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Toto nie je diskusná skupina"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie je názov diskusnej skupiny."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez pripojenie nemôžete synchronizovať vaše kontakty."
 
-#: ../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 "Tento účet nie je pripojený k serveru"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemôžete sa synchronizovať s kontaktom ak nie je prihlásený."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synchronizovať"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../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:"
@@ -6598,275 +6688,300 @@ msgstr ""
 "odoslať správu:"
 
 #. 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 "Pripojenie nie je dostupné"
 
-#: ../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 "Prosím, uistite sa, že ste pripojený k \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Nesprávne JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie je možné spracovať \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí sa musia zhodovať."
 
 #. 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 "Kontakt sa prihlasil"
 
-#: ../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 sa odhlásil"
 
 #. 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 "Nová správa"
 
 #. 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 "Nová krátka správa"
 
 #. 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 "Nová súkromná správa"
 
-#: ../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 "Nový e-mail"
 
-#: ../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 "Požiadavka na prenos súboru"
 
-#: ../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 "Chyba pri prenose súboru"
 
-#: ../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 "Prenos súboru dokončený"
 
-#: ../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 "Prenos súboru zastavený"
 
-#: ../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 "Pozvánka do diskusnej skupiny"
 
-#: ../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 "Kontakt zmenil stav"
 
-#: ../src/dialogs.py:2262 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Krátka správa s použitím účtu %s"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Krátka správa v účte %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Krátku správu"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2269 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2292 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Prijatý %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2315 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Od %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 "RE: %s"
 
-#: ../src/dialogs.py:2395 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:2441
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: ../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 "Chcem si vás pridať do môjho zoznamu kontaktov."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Náladový"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Skupina"
+
+#. 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 "Chcem si vás pridať do môjho zoznamu."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Súkromný zoznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2569
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %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 ""
 "Poradie: %(order)s, akcia: %(action)s, typ: %(type)s, hodnota: %(value)s"
 
-#: ../src/dialogs.py:2630
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Poradie: %(order)s, akcia: %(action)s"
 
-#: ../src/dialogs.py:2672
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upraviť pravidlo</b>"
 
-#: ../src/dialogs.py:2759
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Pridať pravidlo</b>"
 
-#: ../src/dialogs.py:2855
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Súkromné zoznamy pre %s"
 
-#: ../src/dialogs.py:2857
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Súkromné zoznamy"
 
-#: ../src/dialogs.py:2927
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Nesprávny názov zoznamu"
 
-#: ../src/dialogs.py:2928
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Musíte vložiť názov, aby bolo možné vytvoriť nový súkromný zoznam."
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Ste pozvaný do diskusnej skupiny"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:2965
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:2973
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:2975
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete prijať pozvanie?"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:3040 ../src/dialogs.py:3091
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav zvuky"
 
-#: ../src/dialogs.py:3078
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Vybrať obrázok"
 
-#: ../src/dialogs.py:3096
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3161
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Keď %s sa stane:"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne upozornenie pre %s"
 
 #. # means number
-#: ../src/dialogs.py:3232
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3238
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Podmienka"
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "keď som "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6874,38 +6989,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu overená"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Overiť znovu..."
 
-#: ../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 "Identita kontaktu NEoverená"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Overiť..."
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Overili ste identitu kontaktu?"
 
-#: ../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> "
@@ -6915,60 +7030,60 @@ 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
 #, fuzzy, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "Kľúč (%s) kontaktu sa nezhoduje s kľúčom prideleným v programe Gajim."
 
-#: ../src/dialogs.py:3913
+#: ../src/dialogs.py:4381
 #, fuzzy
 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
 #, fuzzy
 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 "Ostatný"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferencia"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez pripojenia, nemôžete prehliadať dostupné služby"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prehliadanie služieb s použitím účtu %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Prehliadanie služieb"
 
-#: ../src/disco.py:657
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Služba nebola nájdená"
 
-#: ../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."
@@ -6976,222 +7091,240 @@ msgstr ""
 "Žiadna služba nie je k dispozícii na zadanej adrese alebo neodpovedá. "
 "Skontrolujte adresu a skúste opäť."
 
-#: ../src/disco.py:662 ../src/disco.py:958
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Služba nie je prehľadávateľná"
 
-#: ../src/disco.py:663
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Tento typ služby neobsahuje žiadne položky na prehľadávanie."
 
-#: ../src/disco.py:700 ../src/disco.py:710
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Neplatný názov servera"
 
-#: ../src/disco.py:757
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prehliadanie %(address)s s použitím účtu %(account)s"
 
-#: ../src/disco.py:797
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Prehliadať"
 
-#: ../src/disco.py:959
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky na prehliadanie."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Vykonať príkaz"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Prieskúmava sa %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1581
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Popis"
 
 #. 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 "Záložka je už nastavená"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Záložka bola úspešne pridaná"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Prihlásiť"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nová správa"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Odhlásiť"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 #, fuzzy
 msgid "SSL certificat validation"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Knižnica používaná k overeniu serverových certifikátov, kvôli zaisteniu "
 "bezpečného pripojenia."
 
-#: ../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 "Vyžaduje 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 "Vyžaduje python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Vyžaduje pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 #, fuzzy
 msgid "Command line"
 msgstr "Príkazy: %s"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Skript na ovládanie programu Gajim cez príkazový riadok."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Vyžaduje 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 "Funkcia nie je dostupná pod Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 #, fuzzy
 msgid "OpenGPG message encryption"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 #, fuzzy
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Šifruje správy rozhovoru pomocou gpg kľúčov."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Vyžaduje gpg a python-GnuPGInterface."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 #, fuzzy
 msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Automaticky zistí stav siete."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Vyžaduje gnome-network-manager a python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Správa sedenia"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Sedenie Gajim bude uložené pri odhlásení a obnovené pri prihlásení."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Vyžaduje python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 #, fuzzy
 msgid "Password encryption"
 msgstr "Heslo pre vstup do miestnosti"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Heslá môžu byť bezpečne uložené a nie sú v obyčajnom texte."
 
-#: ../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 "Vyžaduje gnome-keyring a 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 "Schopnosť pripojiť sa k serverom, ktoré používajú SRV protokoly."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Vyžaduje dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Vyžaduje nslookup k použitiu SRV protokolov."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Kontrola pravopisu"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Kontrolovať pravopis vo vytvorených správach."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 #, fuzzy
 msgid "Requires libgtkspell."
 msgstr "Vyžaduje python-sexy."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 #, fuzzy
 msgid "Notification"
 msgstr "Upozornenia"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Nereagujúce vyskakovacie upozornenia pre nové udalosti."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7199,53 +7332,53 @@ msgstr ""
 "Vyžaduje python-notify alebo instead python-dbus v spojení s notification-"
 "daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Trayikona"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ikona v oblasti systémových upozornení odráža prítomnosť."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Vyžaduje python-gnome2-extras alebo skompilovaný modul trayicon zo "
 "zdrojových kódov Gajim."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Vyžaduje PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 #, fuzzy
 msgid "Automatic status"
 msgstr "_Upraviť stav"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Schopnosť odhadnúť čas nečinnosti v nastavení poradia automatických stavov."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 #, fuzzy
 msgid "Requires python2.5."
 msgstr "Vyžaduje python-gnome2."
 
-#: ../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 "Prevádza LaTeX výrazy medzi $$ $$."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:96
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
@@ -7254,7 +7387,7 @@ msgstr ""
 "Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
 "pravda v Editor rozšírenej konfigurácie."
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:97
 #, fuzzy
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
@@ -7263,25 +7396,25 @@ msgstr ""
 "Vyžaduje texlive-latex-base, dvips a imagemagick. Nastavte 'use_latex' na "
 "pravda v Editor rozšírenej konfigurácie."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "End to End šifrovanie"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 #, fuzzy
 msgid "Encrypting chat messages."
 msgstr "Šifrovanie správ rozhovorov."
 
-#: ../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 "Vyžaduje python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST generátor"
 
-#: ../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)."
@@ -7289,25 +7422,25 @@ msgstr ""
 "Generuje XHTML z výstupu RST kódu (pozrite http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../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 "Vyžaduje python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Schopnosť spraviť klikacie URL v titulkoch okien rozhovorov a diskusných "
 "skupín."
 
-#: ../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 "Vyžaduje python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Funkcia"
 
@@ -7336,7 +7469,7 @@ msgstr "Veľkosť: %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 "Vy"
 
@@ -7346,7 +7479,7 @@ msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Príjemca: "
 
@@ -7378,26 +7511,27 @@ msgid "Error message: %s"
 msgstr "Chybová správa: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr ""
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Prenos súboru zastavený"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Popis:"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pristupovať k tomuto súboru"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
@@ -7417,34 +7551,34 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../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 "Nie je možné prepísať existujúci súbor \"%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."
 msgstr ""
 "Súbor s rovnakým názvom už existuje a nemáte oprávnenie na jeho prepísanie."
 
-#: ../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 "Tento súbor už existuje"
 
-#: ../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 "Čo si prajete vykonať?"
 
 #. 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 "Do priečinku \"%s\" nie je možné zapisovať"
 
-#: ../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 "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
@@ -7480,11 +7614,11 @@ msgstr "Súbor:"
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Meno: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Odosielateľ: "
 
@@ -7492,36 +7626,40 @@ msgstr "Odosielateľ: "
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../src/gajim.py:92
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:164
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim potrebuje X server k behu. Ukončujem..."
 
-#: ../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 potrebuje PyGTK 2.8 alebo vyššie"
 
-#: ../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 potrebuje PyGTK 2.8 alebo vyššie k behu. Ukončujem..."
 
-#: ../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 potrebuje GTK 2.8 alebo vyššie"
 
-#: ../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 potrebuje GTK 2.8 alebo vyššie k behu. Ukončujem..."
 
-#: ../src/gajim.py:202
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ prostredie nepodporuje libglade"
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7530,22 +7668,22 @@ msgstr ""
 "Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
 "poslednú stabilnú verziu z %s"
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Prosím, uistite sa, že GTK+ a PyGTK majú podporu pre libglade vo vašom "
 "systéme."
 
-#: ../src/gajim.py:211
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim potrebuje PySQLite2 pre svoj beh"
 
-#: ../src/gajim.py:219
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vyžaduje pywin32 na spustenie"
 
-#: ../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 "
@@ -7555,11 +7693,11 @@ msgstr ""
 "získať na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim už beží"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7567,35 +7705,35 @@ msgstr ""
 "Pravdepodobne už jeden program Gajim beží\n"
 "Želáte si aj napriek tomu spustiť Gajim?"
 
-#: ../src/gajim.py:460
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/gajim.py:461
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:475
+#: ../src/gajim.py:443
 #, fuzzy
 msgid "GPG key expired"
 msgstr "CRL vypršal"
 
-#: ../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 "Budete pripojený k %s bez OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:485
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/gajim.py:486
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
-#: ../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 "
@@ -7603,56 +7741,60 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../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 "Prijať túto požiadavku?"
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gajim.py:568
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Overenie HTTP (%(method)s) pre %(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 "Spojenie zlyhalo"
 
-#: ../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 "Chyba %(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 "chyba pri odosielaní %(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 "Požiadavka o zapísanie"
 
-#: ../src/gajim.py:1013
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Kontakt \"%s\" vás autorizoval, aby ste mohol vidieť jeho alebo jej stav."
 
-#: ../src/gajim.py:1026
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: ../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?"
@@ -7660,78 +7802,78 @@ msgstr ""
 "Budete vždy vidieť jeho alebo ju ako neprihlásený.\n"
 "Chcete odstrániť jeho alebo ju zo zoznamu kontaktov?"
 
-#: ../src/gajim.py:1052 ../src/notify.py:497
+#: ../src/gajim.py:1034 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Odhlásiť"
 
-#: ../src/gajim.py:1093
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../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 je známy ako %(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 je teraz %(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 má nastavený predmet na %(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 ""
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../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 "Zaznamenávanie miestnosti je teraz povolené"
 
-#: ../src/gajim.py:1443
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávanie miestnosti je teraz zakázané"
 
-#: ../src/gajim.py:1445
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Miestnosť je teraz anonymná"
 
-#: ../src/gajim.py:1483
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Pre prihlásenie do miestnosti %s je potrebné heslo. Zadajte ho, prosím."
 
-#: ../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"
@@ -7739,31 +7881,32 @@ msgstr ""
 "Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
 "GPG agent alebo vrátil nesprávne heslo.\n"
 
-#: ../src/gajim.py:1519
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:1522
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:1545
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG je nepoužitelný"
 
-#: ../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 "Znovu sa už _nepýtať"
 
-#: ../src/gajim.py:1555
+#: ../src/gajim.py:1540
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7772,12 +7915,12 @@ msgstr ""
 "Správca zväzku kľúčov je nainštalovaný, ale \t\t\t\t\t\t\tnesprávne spustený "
 "(pravdepodobne je \t\t\t\t\t\t\tnesprávne nastavená premenná prostredia)"
 
-#: ../src/gajim.py:1662
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový e-mail %(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"
@@ -7785,7 +7928,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/gajim.py:1677
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7800,80 +7943,90 @@ msgstr ""
 "Predmet: %(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 vám chce poslať súbor."
 
-#: ../src/gajim.py:1816
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Odstráni kontakt zo zoznamu"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Chyba čítania súboru:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Úspešne prijatý súbor %(filename)s od %(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 "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: ../src/gajim.py:1833
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Úspešne odoslaný súbor %(filename)s pre %(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 "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../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 "Nepodarilo sa dešifrovať správu"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Prosím, zadajte nové používateľské meno pre váš miestny účet"
 
-#: ../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 "Chyba."
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: ../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 ""
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: ../src/gajim.py:2125
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7881,15 +8034,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gajim.py:2151
+#: ../src/gajim.py:2156
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -7906,11 +8059,11 @@ msgstr ""
 "\n"
 "Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
 
-#: ../src/gajim.py:2181 ../src/gajim.py:2216
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: ../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?"
@@ -7918,11 +8071,11 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
 "že to chcete urobiť?"
 
-#: ../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 "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: ../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?"
@@ -7930,28 +8083,28 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: ../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 "Emotikony zakázané"
 
-#: ../src/gajim.py:2725
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 "Vami nastavená téma emotikôn nebola nájdená, takže emotikony budú zakázané."
 
-#: ../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 "
@@ -7961,103 +8114,87 @@ msgstr ""
 "aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
 "trac.gajim.org/wiki/Emoticons."
 
-#: ../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 "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ ste neviditeľný"
 
 #. 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 "Nie je možné uložiť nastavenia"
 
-#: ../src/gajim.py:3148
-msgid "Bookmark already set"
-msgstr "Záložka je už nastavená"
-
-#: ../src/gajim.py:3149
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Diskusná skupina \"%s\" je už vo vašich záložkách."
-
-#: ../src/gajim.py:3162
-msgid "Bookmark has been added successfully"
-msgstr "Záložka bola úspešne pridaná"
-
-#: ../src/gajim.py:3163
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Môžete spravovať záložky cez Akcie v menu vo vašom zozname."
-
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Zobrazí pomocníka pre daný príkaz"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "príkaz"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "ukáž pomocníka pre príkaz"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Zobraziť alebo skryť okno so zoznamom"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Vyskakovacie okno s ďalšou čakajúcou udalosťou"
 
-#: ../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"
 msgstr ""
 
-#: ../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 "účet"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "zobraziť len kontakty daného účtu"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Vypíše zoznam registrovaných účtov"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Zmeniť stav účtu alebo účtov"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "stav"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jeden z: odhlásený, prítomný, chat, preč, diskutovať, zaneprázdnený, "
 "neviditeľný"
 
-#: ../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 "správa"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "správa o stave"
 
-#: ../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"
@@ -8065,18 +8202,22 @@ msgstr ""
 "zmeniť stav účtu \"účet\". Ak nie je špecifikovaný, pokús sa zmeniť všetky "
 "účty, ktoré majú nastavenú vlastnosť \"synchronizácia s globálnym stavom\""
 
-#: ../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 "Zobrazí diskusné okno, takže môžete odoslať správu kontaktu"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, s ktorým chcete komunikovať"
 
-#: ../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 "ak je špecifikované, kontakt je zobraný zo zoznamu pre tento účet"
 
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
 #: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
@@ -8273,51 +8414,56 @@ msgstr ""
 msgid "Account in which you want to handle it"
 msgstr "Účet ktorý chcete ovládať"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "obsah správy"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Pripojiť MUC miestnosť"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "miestnosť"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID miestnosti"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "prezývka"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Prezývka na používanie"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Heslo pre vstup do miestnosti"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Účet s ktorým chcete vstúpiť do miestnosti"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Kontrolovať, či je Gajim spustený"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Zobraziť alebo skryť okno ipython"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Chýbajúci argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8326,15 +8472,15 @@ msgstr ""
 "'%s' nie je vo vašom zozname.\n"
 "Prosím, špecifikujte účet, z ktorého odoslať správu."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Nemáte žiadny aktívny účet"
 
-#: ../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 "Vyzerá že Gajim nebeží. Nemôžete tak použiť gajim-remote."
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8343,16 +8489,16 @@ msgstr ""
 "Použitie: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s nenájdený"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8361,7 +8507,7 @@ msgstr ""
 "Použitie: %s príkaz [argumenty]\n"
 "Príkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:482
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8370,7 +8516,7 @@ msgstr ""
 "Príliš veľa argumentov. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:487
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8379,7 +8525,7 @@ msgstr ""
 "Argument \"%(arg)s\" nie je špecifikovaný. \n"
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
-#: ../src/gajim-remote.py:506
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Nesprávna uri"
 
@@ -8396,15 +8542,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "názov témy"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Nemôžete odstrániť súčastnú tému"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému ako sučastnú."
 
@@ -8418,150 +8564,154 @@ msgstr "Odoslanie súkromnej správy sa nepodarilo"
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:453
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Vložiť prezývku"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Rozhovor s "
 
-#: ../src/groupchat_control.py:607
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Pokračovanie rozhovoru"
 
-#: ../src/groupchat_control.py:1014
-msgid "Really send file?"
-msgstr "Skutočne poslať súbor?"
-
-#: ../src/groupchat_control.py:1015
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Ak pošlete súbor %s, on/ona budú poznať vaše skutočné 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 "Zaznamenávanie miestosti je povolené"
 
-#: ../src/groupchat_control.py:1131
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Bola vytvorená nová miestnosť"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. 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 bol vykopnutý: %(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 bol vykopnutý %(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 bol zakázaný: %(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 bol zakázaný %(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 "Teraz ste známy ako %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 bol odstránený z miestnosti (%(reason)s)"
 
-#: ../src/groupchat_control.py:1203
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "príslušnosť zmenená"
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "nastavenie miestnosti sa zmenilo na len členovia"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "vypnutie systému"
 
-#: ../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 "** Rola %(nick)s bola nastavená na %(role)s kontaktom %(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 "** Rola %(nick)s bola nastavená na %(role)s"
 
-#: ../src/groupchat_control.py:1334
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_control.py:1339
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
-msgid "Invalid nickname"
-msgstr "Neplatná prezývka"
-
-#: ../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 "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_control.py:1512
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Diskusná skupina nemá nastavený predmet"
 
-#: ../src/groupchat_control.py:1524
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvaný %(contact_jid)s do %(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 "Prezývka nenájdená: %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 ""
 "Použitie: /%s <prezývka|JID> [dôvod], zakáže JID v diskusnej skupine. "
 "Prezývka človeka môže byť zmenená, ale nesmie obsahovať \"@\". Ak je JID "
 "práve v diskusnej skupine, on/ona/ono bude vykoponutý. Medzery v prezývkach "
 "nie sú podporované."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8570,7 +8720,7 @@ msgstr ""
 "Použite: /%s <prezývka>, otvorí okno sukromného rozhovoru s určeným "
 "používateľom."
 
-#: ../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 "
@@ -8579,7 +8729,7 @@ msgstr ""
 "Použitie: /%s [dôvod], zatvorí aktuálnu kartu v okne a zobrazí zdôvodnenie, "
 "pokiaľ je špecifikované."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8588,7 +8738,7 @@ msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej diskusnej skupiny, "
 "prípadne sa zobrazí aj dôvod."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8597,18 +8747,17 @@ msgstr ""
 "Použitie: /%s <miestnosť>@<server>[/prezývka], ponúkne možnosť pripojiť sa "
 "do miestnosť@server pre prezývku, ak je špecifikovaný."
 
-#: ../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 ""
 "Použitie: /%s <prezývka> [dôvod], odstráni navštevníka z diskusnej skupiny "
 "podľa prezývky, prípadne zobrazí dôvod. Medzery v prezývkach nie sú "
 "podporované."
 
-#: ../src/groupchat_control.py:1696
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8617,83 +8766,98 @@ msgstr ""
 "Použitie: /%s <prezývka> [správa], otvorí okno sukromného rozhovoru a pošle "
 "správu určenému používateľovi podľa prezývky."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Použitie: /%s , zobrazí mená členov v diskusnej skupine."
 
-#: ../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 ""
 "Použitie: /%s [téma], zobrazí alebo aktualizuje tému v diskusnej skupine."
 
-#: ../src/groupchat_control.py:1712
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "Použitie: /%s <správa>, odošle správu, bezohľadu na ďalšie príkazy."
 
-#: ../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 ""
+"Použitie: /%s <prezývka>, zmení prezývku v aktuálnej diskusnej skupine."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ste si istý, že chcete opustiť diskusnú skupinu \"%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 "Ak zatvoríte okno, budete odpojený z tejto diskusnej skupiny."
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Zmena predmetu"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Prosím, špecifikujte nový predmet:"
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Zmena prezývky"
 
-#: ../src/groupchat_control.py:1888
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1915
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Ničí sa %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 "Vykopnúť %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 "Môžete dole špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2380
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazujem %s"
@@ -8724,82 +8888,82 @@ msgstr "Podrobnosti"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Chyba štruktúry súboru:"
 
 #. 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 "Nie je možné zapisovať do %s. Správca sedenia nebude fungovať"
 
 #. 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 nie je štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete, aby bol Gajim štandartným Jabber klientom?"
 
-#: ../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 "Vždy kontrolovať pri spustení, či je Gajim štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: ../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 ""
 "Obrázok nie je možné uložiť vo formáte %(type)s. Uložiť ako %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: ../src/history_manager.py:96
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nie je možné nájsť databázu so záznamami o histórii"
 
 #. holds jid
-#: ../src/history_manager.py:136
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. 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 "Dátum"
 
 #. 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 "Prezývka"
 
 #. 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 "Správa"
 
-#: ../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 ""
 "Skutočne si želáte vyčistiť databázu? (SILNE SA NEODPORÚČA, KEĎ BEŽÍ GAJIM)"
 
-#: ../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 "
@@ -8813,27 +8977,27 @@ msgstr ""
 "\n"
 "V prípade, že zvolite Áno, prosíme o strpenie..."
 
-#: ../src/history_manager.py:433
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exportovanie záznamov histórie..."
 
-#: ../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 o %(time)s povedal: %(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] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
 msgstr[1] "Skutočne chcete odstrániť záznamy vybraného kontaktu?"
 msgstr[2] "Skutočne chcete odstrániť záznamy vybraných kontaktov?"
 
-#: ../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 "Toto je nevratná operácia."
 
-#: ../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] "Skutočne si želáte zmazať vybraných správ?"
@@ -8865,27 +9029,37 @@ msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/htmltextview.py:564 ../src/htmltextview.py:575
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Vypršal čas nahrávania obrázku"
 
-#: ../src/htmltextview.py:585
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Obrázok je príliš veľký"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Nie ste pripojený k serveru"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Skutočne si želáte zmazať vybraných správ?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:445
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Diskusné skupiny"
 
-#: ../src/message_window.py:447
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Súkromné rozhovory"
 
-#: ../src/message_window.py:453
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Správy"
 
@@ -8897,71 +9071,67 @@ msgstr "- správy budú zaznamenané"
 msgid "- messages will not be logged"
 msgstr "- správy nebudú zaznamenané"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová správa od %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová súkromná správa od diskusnej skupiny %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 ""
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Správa od %(nickname)s"
 
-#: ../src/notify.py:534
+#: ../src/notify.py:555
 #, fuzzy
 msgid "Ignore"
 msgstr "_Ignorovať"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Spoločné"
-
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Získava sa 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 "Súbor je prázdny"
 
-#: ../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 "Súbor neexistuje"
 
 #. 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 "Nie je možné načítať obrázok"
 
@@ -8993,47 +9163,47 @@ msgstr ""
 "Nastala chyba pri zverejňovaní vašich osobných údajov, skúste to prosím "
 "neskôr."
 
-#: ../src/roster_window.py:285 ../src/roster_window.py:939
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Zlúčené účty"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1875
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../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 ""
 "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho alebo jej stav."
 
-#: ../src/roster_window.py:1908
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz vás \"%s\" uvidí len v stave odhlásený."
 
-#: ../src/roster_window.py:1934
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelný"
 
-#: ../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 "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: ../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?"
@@ -9042,15 +9212,28 @@ msgstr ""
 "diskusných skupín. Ste si skutočne istý, že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:2120
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../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 "Ste si istý, že chcete opustiť diskusnú skupinu \"%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 "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9058,16 +9241,16 @@ msgstr ""
 "Správu bude možné prečítať neskôr len vtedy, ak máte povolenú históriu a "
 "kontakt je vo vašom zozname kontaktov."
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Musíte si ich prečítať pred odstránením tohoto transportu."
 
-#: ../src/roster_window.py:2499
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:2500
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9075,11 +9258,11 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:2503
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transport bude odstránený"
 
-#: ../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 "
@@ -9089,57 +9272,57 @@ msgstr ""
 "transport: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2639
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Premenovať kontakt"
 
-#: ../src/roster_window.py:2640
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadať novú prezývku pre kontakt %s"
 
-#: ../src/roster_window.py:2647
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Premenovať skupinu"
 
-#: ../src/roster_window.py:2648
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadať nové meno skupiny %s"
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Odstrániť skupinu"
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chcete skutočne odstrániť skupinu %s zo zoznamu kontaktov?"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 "Tiež odstráni všetky kontakty v tejto skupine z vášho zoznamu kontaktov"
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:3099
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../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 ""
 
-#: ../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."
@@ -9148,11 +9331,11 @@ msgstr ""
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovať?"
 
-#: ../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."
@@ -9160,16 +9343,16 @@ msgstr ""
 "Odstránením tohto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona alebo on vás vždy uvidí ako odhlásený."
 
-#: ../src/roster_window.py:3118
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
 #. 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 "Kontakt bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9179,20 +9362,20 @@ msgstr ""
 "taktiež odstránite vašu autorizáciu, to znamená, že vás budú vidieť ako "
 "odhlásený."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:3183
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: ../src/roster_window.py:3733
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Server nepodporuje ukladanie metakontaktov"
 
-#: ../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."
@@ -9200,25 +9383,25 @@ msgstr ""
 "Váš server nepodporuje ukladanie informácií metakontaktov. Tak tieto "
 "informácie nebudú uložené pri ďalšom prihlásení."
 
-#: ../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 ""
 "Práve sa chystáte vytvoriť metakontakt. Ste si skutočne istý, že chcete "
 "pokračovať?"
 
-#: ../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 "
 "accounts."
 msgstr ""
 
-#: ../src/roster_window.py:3935
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Neplatná URI súboru:"
 
-#: ../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:"
@@ -9226,128 +9409,130 @@ msgstr[0] "Chcete poslať tieto súbory účtu %s:"
 msgstr[1] "Chcete poslať tento súbor účtu %s:"
 msgstr[2] "Chcete poslať tieto súbory účtu %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Poslať %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Poslať súbor kontaktu"
+
 #. 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 "použiť účet %s"
 
 #. add
-#: ../src/roster_window.py:4710
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
 #. disco
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:4752 ../src/systray.py:278
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Spravovať záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4772
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %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 "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:4901
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Hudba"
 
-#: ../src/roster_window.py:4908
-msgid "Mood"
-msgstr "Nálada"
-
-#: ../src/roster_window.py:4912
-msgid "Activity"
-msgstr "Aktivita"
-
-#: ../src/roster_window.py:4917
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Nastavovať služby..."
 
-#: ../src/roster_window.py:5071
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maximalizovať všetko"
 
 #. 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 "Poslať sprá_vu skupine"
 
-#: ../src/roster_window.py:5087
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Všetkým používateľom"
 
-#: ../src/roster_window.py:5091
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#: ../src/roster_window.py:5502
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Chcem si vás pridať do svojho zoznamu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5625
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "S_pravovať kontakty"
 
 #. Send single message
-#: ../src/roster_window.py:5686
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Poslať krátku správu"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "S_pravovať transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5750
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Upraviť transport"
 
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
 
-#: ../src/roster_window.py:5831
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
-#: ../src/roster_window.py:5911
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Nová diskusná skupina"
 
 #. History manager
-#: ../src/roster_window.py:6024
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Správca histórie"
 
-#: ../src/roster_window.py:6033
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Pripojiť sa k diskusnej skupine"
 
-#: ../src/roster_window.py:6243
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Zmeniť správu o stave..."
 
@@ -9368,16 +9553,16 @@ msgstr "Žiadny výsledok"
 msgid "Disk WriteError"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Predmet: %s"
 
-#: ../src/session.py:403 ../src/session.py:438
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Potvrdiť tieto voľby relácie"
 
-#: ../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 +9572,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:439
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9402,7 +9587,7 @@ msgstr ""
 "\n"
 "Pokračovať s reláciou?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
@@ -9410,116 +9595,108 @@ msgstr "_Zmeniť správu o stave..."
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
 
-#: ../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 "Zdroj: "
 
-#: ../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 tejto diskusnej skupiny"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blokovaný]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Posledný stav: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Pripojený"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Odpojený"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Zápis: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Nálada:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Aktivita:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Pieseň:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Nahrať"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Dokončený"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?stav prenosu:Pozastavené"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../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,29 +9704,29 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:268
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../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 "od %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</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"
@@ -9557,7 +9734,7 @@ msgstr ""
 "Tento kontakt sa zaujíma o vaše informácie o prítomnosti, ale vy sa "
 "nezaujímate o jeho/jej informácie o prítomnosti"
 
-#: ../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"
@@ -9565,12 +9742,12 @@ msgstr ""
 "Zaujímate sa o informácie o prítomnosti vášho kontaktu, ale on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. 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"
@@ -9578,18 +9755,60 @@ msgstr ""
 "Nezaujímate sa o informácie o prítomnosti vášho kontaktu a ani on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:353
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čakáte na odpoveď od kontaktu ohľadne vašej požiadavky na zápis"
 
-#: ../src/vcard.py:355
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../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 " zdroj s prioritou "
 
+#~ msgid "Your JID:"
+#~ msgstr "Vaše JID:"
+
+#, fuzzy
+#~ msgid "B_OSH Port:"
+#~ msgstr "_Port:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Zobraziť _zoznam"
+
+#, fuzzy
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Zvoľte účet, s ktorým sa chcete synchronizovať"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s od %(artist)s\n"
+#~ "z %(source)s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#~ msgid "Custom"
+#~ msgstr "Vlastný"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Dvojité Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Tento účet už nastavný v Gajim."
+
+#~ msgid "Generic"
+#~ msgstr "Spoločné"
+
+#~ msgid "Mood"
+#~ msgstr "Nálada"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivita"
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Kliknite pre zistenie vlastností (ako MSN, ICQ transport) jabber serverov"
diff --git a/po/sr.po b/po/sr.po
index 794ffadbb..b188ad1ad 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,13 +4,13 @@
 # This file is distributed under the same license as the gajim package.
 #
 # B. Kokanovic <branko.kokanovic@gmail.com>, 2007.
-# Branko Kokanovic <branko.kokanovic@gmail.com>, 2008.
+# Branko Kokanovic <branko.kokanovic@gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 16:14+0100\n"
-"PO-Revision-Date: 2008-12-01 21:36+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:04+0200\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid "_Add Contact..."
 msgstr "_Додај контакт..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Откривање сервиса"
 
@@ -63,7 +63,7 @@ msgid "_Personal Events"
 msgstr "Лични догађаји"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Започни разговор"
 
@@ -95,6 +95,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Молимо одаберите сервер</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"
@@ -102,60 +106,54 @@ msgstr ""
 "Додајте овај сертификат листи сертификата којима верујете\n"
 "SHA1 потпис сертификата:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Кликните да видите могућности (као што су MSN, ICQ транспорти) џабер сервера "
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Користи аутентикацију"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Повежи се када притиснем Заврши"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Гајим: чаробњак за креирање налога"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Већ имам налог који желим да користим"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Желим да региструјем нови налог"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако је означено, Гајим ће памтити лозинку за овај налог"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Подеси..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Прок_си:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Сними лозинку"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Могућности сервера"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Постави мој профил при повезивању"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Користи Ваше одређено име хоста/порт "
 
@@ -168,30 +166,31 @@ msgstr ""
 "на џабер мрежу."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Ваш џабер ИД:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Напредно"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Заврши"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Име хоста:"
 
+#: ../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 "_Џабер ИД:"
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Лозинка:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Порт:"
 
@@ -199,11 +198,6 @@ msgstr "_Порт:"
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Корисничко име:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -212,18 +206,16 @@ msgstr "<b>Остало</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Личне информације</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Налог"
 
@@ -232,23 +224,22 @@ msgid "Account Modification"
 msgstr "Измена налога"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Администраторске операције"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Аутоматско повезивање када се веза изгуби"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "По_вежи се приликом покретања Гајима"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "И_змени лозинку"
 
@@ -265,37 +256,35 @@ msgstr ""
 "омогућеном, TLS ће бити искључен"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Одаберите _Кључ"
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Кликните за измену лозинке Вашег налога"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Кликните да затражите ауторизацију свим контактима другог налога"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Веза"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Измени личне информације"
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:514 ../src/notify.py:545
-#: ../src/notify.py:557
+#: ../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 "Гајим"
 
@@ -303,17 +292,14 @@ msgstr "Гајим"
 #. 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2672
-#: ../src/roster_window.py:5157
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Опште"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Име хоста"
 
@@ -336,7 +322,6 @@ msgstr ""
 "прекид везе због дуге неактивности"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -346,7 +331,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -356,7 +340,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -372,43 +355,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Информације о Вама, како су ускладиштене на серверу"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Није одабран ниједан кључ"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2741
-#: ../src/roster_window.py:2747 ../src/roster_window.py:2752
+#: ../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 "Ништа"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Личне Информације"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Порт:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Приори_тет"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -419,7 +404,7 @@ msgstr ""
 "приоритетомдобија догађаје"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Приоритет ће бити аутоматски промењен према Вашем статусу."
 
@@ -428,12 +413,12 @@ msgid "Proxy:"
 msgstr "Прокси:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Ресур_с:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -447,30 +432,25 @@ msgstr ""
 "приоритетом ће добијати обавештења о догађајима"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Сними :лозинку (несигурно)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Сними дневник разговора за све контакте"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Шаљи податке о живости"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Синхронизирај статус налога са глобалним статусом"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Синхронизуј контакте"
@@ -480,21 +460,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Користи _SSL (застарело)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Користи прокси за пренос датотека"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Подеси према статусу"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "_Џабер ИД:"
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 msgid "_Name:"
 msgstr "_Име:"
 
@@ -502,11 +477,21 @@ msgstr "_Име:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Прокси</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Подеси према статусу"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Налози"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Користи аутентикацију"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -514,21 +499,18 @@ msgstr ""
 "Означите ово да Вас Гајим пита пре него што пошаљете лозинку преко несигурне "
 "везе."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "По_вежи се приликом покретања Гајима"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "Е-мејл:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Омогући"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Име:"
 
@@ -537,7 +519,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Ако је означено, Гајим ће узети лозинку од GPG агента"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -548,56 +529,98 @@ msgstr ""
 "Могли бисте узети у обзир и могућност измене подешавања firewall-а."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:679
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "Џабер ИД:"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Презиме:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Споји налоге"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5108
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Преи_менуј"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Шаљи податке о живости"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Синхронизирај статус налога са глобалним статусом"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Користи GPG агента"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Користи Ваше одређено име хоста/порт "
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Користи свој порт:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Измени личне информације"
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Омогући"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Име хоста:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Подеси..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Порт:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "Упозори пре коришћења несигурне везе"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "користи HTTP_PROXY променљиву окружења"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "користи HTTP_PROXY променљиву окружења"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Налог:"
@@ -783,7 +806,7 @@ msgid "All statuses"
 msgstr "Сви статуси"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Одсутан"
 
@@ -800,7 +823,7 @@ msgid "Have "
 msgstr "Имам "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Невидљив"
 
@@ -809,7 +832,7 @@ msgid "Launch a command"
 msgstr "Покрените команду"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Недоступан"
 
@@ -928,7 +951,7 @@ msgstr "Задњи пут измењено:"
 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 "Примили сте нови унос:"
 
@@ -972,11 +995,19 @@ msgstr "Унесите нову лозинку:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Упишите Вашу нову статусну поруку</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 "Активност:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Расположење:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Већ постављене поруке:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Сними као већ постављену..."
 
@@ -1011,50 +1042,36 @@ msgstr "_Отвори везу у интернет прегледачу"
 msgid "_Start Chat"
 msgstr "_Започни разговор"
 
-#. Execute Command
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5694
-msgid "Execute Command..."
-msgstr "Изврши наредбу..."
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
 msgid "Invite _Contacts"
 msgstr "Позови контакте"
 
-#. Send Custom Status
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5073 ../src/roster_window.py:5660
-msgid "Send Cus_tom Status"
-msgstr "Пошаљи кориснички дефинисан статус"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Пошаљи _датотеку"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
 msgstr "Укључи/искључи енкрипцију с краја на крај"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Укључи/искључи Open_PGP енкрипцију"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "_Додај на листу контаката"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:8
+#: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5804
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Историјат"
 
@@ -1162,7 +1179,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Настави"
 
@@ -1198,7 +1215,7 @@ msgstr ""
 "Ред контаката\n"
 "Банер разговора"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:752
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Подебљано"
 
@@ -1218,11 +1235,11 @@ msgstr "Персонализација Гајим тема"
 msgid "Gone"
 msgstr "Отишао"
 
-#: ../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 "Неактивно"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:753
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Курзив"
 
@@ -1270,7 +1287,7 @@ msgstr "Промени _тему..."
 msgid "Configure _Room..."
 msgstr "Подеси _собу..."
 
-#: ../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 "_Маркирај ову со_бу"
 
@@ -1302,23 +1319,37 @@ msgstr "_Админ"
 msgid "_Ban"
 msgstr "_Забрани"
 
-#: ../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 "_Блокирај"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Избаци"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Члан"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Власник"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Пошаљи приватну поруку"
 
-#: ../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 "_Одблокирај"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Глас"
 
@@ -1326,13 +1357,13 @@ msgstr "_Глас"
 msgid "Create new post"
 msgstr "Направи нову објаву"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Од"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Тема"
 
@@ -1350,7 +1381,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добродошли у Гајимов менаџер дневника историјата</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 "Обриши"
 
@@ -1403,7 +1435,7 @@ msgstr "Претрага:"
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
@@ -1430,8 +1462,8 @@ msgstr "Недавно:"
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
-#: ../src/disco.py:1620
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Придружи се"
 
@@ -1460,7 +1492,7 @@ msgstr "Умањи прозор на ауто повезивање"
 msgid "Print status:"
 msgstr "Испис статуса:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1489,36 +1521,54 @@ msgid "<b>Settings</b>"
 msgstr "<b>Подешавања</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP спој\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Подешавање прокси профила"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Име:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Лозинка:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Врста:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Прокси:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Користи аутентикацију"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Порт:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Хост:"
+msgid "Use HTTP prox_y"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Користи аутентикацију"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Врста:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Корисничко име:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1568,7 +1618,7 @@ msgstr "Прикажи профил контакта (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 "_Пошаљи"
 
@@ -1666,10 +1716,14 @@ msgstr ""
 "невидљив"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Питај за статусну поруку при:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1683,19 +1737,19 @@ msgstr ""
 "Увек користи предефинисане ХФЦЕ4 апликације\n"
 "Прилагођено"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Порука разговора:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Провери по стартовању да ли је Гајим подразумевани џабер клијент"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Конфигурисање боје и фонта интерфејса"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1709,31 +1763,31 @@ msgstr ""
 "Откачена листа контаката са разговорима груписаном по налозима\n"
 "Откачена листа контаката са разговорима груписаном по типу"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Прикажи активности контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Прикажи додатне е-мејл детаље"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Прикажи _песме контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Прикажи _аватаре контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Прикажи _расположења контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Прикажи статусне поруке контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1743,7 +1797,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се приказивати у "
 "прозорима разговора."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1753,7 +1807,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се слати другој "
 "особи."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1761,11 +1815,11 @@ msgstr ""
 "Гајим ће Вас обавестити о контактима који су се управо одјавили са искачућим "
 "прозором у доњем десном углу екрана"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Сакриј сву дугмад у прозору разговора"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1773,7 +1827,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1781,14 +1835,14 @@ msgstr ""
 "Ако је означена, Гајим ће уједно укључити и информације о пошиљаоцу нових е-"
 "мејлова"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако је означена, Гајим ће аутоматски променити статус у Одсутан када рачунар "
 "није у употреби."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1796,7 +1850,7 @@ msgstr ""
 "Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
 "дуже није у употреби"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1804,7 +1858,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
 "у групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1812,25 +1866,25 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
 "контакта у листи контаката и у групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати активности контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати расположење контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати песме контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1841,7 +1895,7 @@ msgstr ""
 "поље за унос, подразумевани језик ће бити коришћен за овај контакт или "
 "групни разговор."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1850,7 +1904,7 @@ msgstr ""
 "Ако је означена, Гајим ће игнорисати све долазне догађајеКористите са "
 "опрезом, блокираће све поруке које долазе од људи ван Ваше листе контаката"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1860,7 +1914,7 @@ msgstr ""
 "када се користи E2E енкрипција, друга страна мора да се сложи са чувањем "
 "дневника, у супротном се поруке неће памтити."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1868,7 +1922,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказати поруку када се прими нови е-мејл преко "
 "GMail-амејлова"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1877,7 +1931,7 @@ msgstr ""
 "Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
 "(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1885,7 +1939,7 @@ msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1893,43 +1947,50 @@ msgstr ""
 "Ако није онемогућено, Гајим ће заменити ascii смајлије као нпр. ':)' са "
 "еквивалентним анимираним или статичним графичким смајлијима"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Уписуј у дневник шифроване сесије разговора"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Начини прозор поруке компактним"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Поде_си..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Обавештења"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Обавести ме о контактима који се _пријаве"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Обавести ме о контактима који се _одјаве"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Обавести ме о новопристиглој Гмаил е-мејл пошти"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Лични догађаји"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Пуштај звукове"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1939,19 +2000,24 @@ msgstr ""
 "Обавести ме о томе\n"
 "Прикажи само у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Прикажи догађај у системској касети"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Пријављивању"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Одјављивању"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1959,139 +2025,145 @@ msgstr ""
 "Неке поруке могу укључивати богати садржај (форматирање, боје итд.). Ако је "
 "означено, Гајим ће само приказивати сирови текст поруке."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Скуп статусних икона:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Ауто статусна порука при одсутности. Ако је празно, Гајим неће изменити "
 "тренутну статусну поруку"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Ауто статусна порука при недоступности. Ако је празно, Гајим неће изменити "
 "тренутну статусну поруку"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Користи иконе за _транспорте"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Користи системски подразумевано"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Када се прими нови догађај:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "Аутом_атски одсутан после:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Интернет прегледач:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Приказана обавештења о стању разговора:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Смајлији:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Прегледач датотека:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Обоји погрешно написане речи"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнориши догађаје од контаката који нису на листи"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнориши богато форматирани садржај у пристиглим порукама"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Долазна порука:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_Е-мејл клијент:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "Аутоматски _недоступан након:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Одлазна порука:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Поново учитај подразумеване боје"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "Пошаљи обавештења о стању разговора:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Статусна порука:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "URL осветљавање:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "Понашање прозора:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "у _групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "у _листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "минута"
 
@@ -2139,7 +2211,7 @@ msgstr "Џабер ИД"
 msgid "Order:"
 msgstr "Поредак:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2566
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Листа приватности"
 
@@ -2204,108 +2276,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Фирма:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Држава:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Одсек:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Е-мејл:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Додатна адреса:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Презиме:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Пуно име</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Име:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Лична страна:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Средње име:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Име:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Надимак:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Број телефона:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Позиција:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Поштански број:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Улога:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Покрајина:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Улица:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Суфикс:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "О"
 
@@ -2315,17 +2387,17 @@ msgstr "Кликните да бисте поставили Ваш аватар"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: ГГГГ-ММ-ДД"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Личне информације"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Посао"
 
@@ -2343,8 +2415,8 @@ msgstr "Уклони налог и из Гајима и са сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5145
-#: ../src/roster_window.py:5622 ../src/roster_window.py:5751
+#: ../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 "_Уклони"
 
@@ -2364,10 +2436,16 @@ msgstr "Придружи Open_PGP Кључ..."
 msgid "Edit _Groups..."
 msgstr "Измени _групе..."
 
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5815
+msgid "Execute Command..."
+msgstr "Изврши наредбу..."
+
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5063 ../src/roster_window.py:5575
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
@@ -2375,6 +2453,12 @@ msgstr "Позо_ви у"
 msgid "Remo_ve"
 msgstr "_Уклони"
 
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
+msgid "Send Cus_tom Status"
+msgstr "Пошаљи кориснички дефинисан статус"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Пошаљи једну _поруку..."
@@ -2396,12 +2480,6 @@ msgstr "Започни ра_зговор"
 msgid "_Allow him/her to see my status"
 msgstr "_Дозволи му/јој да види мој статус"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5136 ../src/roster_window.py:5612
-#: ../src/roster_window.py:5741
-msgid "_Block"
-msgstr "_Блокирај"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Забрани му/јој да види мој статус"
@@ -2423,16 +2501,34 @@ msgstr "_Преименуј..."
 msgid "_Subscription"
 msgstr "_Претплата"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5130 ../src/roster_window.py:5606
-#: ../src/roster_window.py:5738
-msgid "_Unblock"
-msgstr "_Одблокирај"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Поништи игнрисање"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Додај контакт..."
@@ -2458,56 +2554,62 @@ msgid "Profile, A_vatar"
 msgstr "Профил, А_ватар"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Прикажи контакте који нису на вези"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Прикажи транс_порте"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Прикажи контакте који нису на вези"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "_Прикажи листу контаката"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Налози"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Акције"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1353
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Измени"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_ЧПП"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Подешавања"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Излаз"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "Пошаљи једну _поруку..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Приказ"
 
@@ -2524,11 +2626,11 @@ msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5763
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "Информације"
 
-#: ../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 "_Претрага"
 
@@ -2614,10 +2716,6 @@ msgstr "Захтев за претплатом"
 msgid "_Deny"
 msgstr "_Одбиј"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Одаберите налог са којим желите да се синхронизујете"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Одаберите налог са којим желите да се синхронизујете"
@@ -2642,10 +2740,6 @@ msgstr "Пошаљи _једну поруку"
 msgid "Show All Pending _Events"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "_Прикажи листу контаката"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Ста_тус"
@@ -2663,49 +2757,54 @@ msgstr "<b>Ауторизација:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Клијент:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Покрајина:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Џабер ИД:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Статус:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Пријава:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Систем:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Коментари"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Конфигурисани аватар:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Информације контакта"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Још"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Кориснички аватар:"
 
@@ -2717,6 +2816,11 @@ msgstr "<b>Џабер саобраћај</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Унос</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Омогући"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2745,13 +2849,13 @@ msgstr "Придружи Open_PGP Кључ"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5595
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Измени _групе"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5721
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Преименуј"
 
@@ -2775,29 +2879,25 @@ msgstr "Ресурс:"
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Измени налог"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Поништи одобравање"
 
-#: ../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 "Тренутно извршавате команду. Да ли желите да је прекинете?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Сервис је изменио идентификатор сесије."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Сервис је послао лоше податке"
 
+#: ../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 "Сервис је вратио грешку."
 
@@ -2822,7 +2922,7 @@ msgstr "Цео број"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:772
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Боја"
 
@@ -2847,174 +2947,197 @@ msgstr "(ништа)"
 msgid "Hidden"
 msgstr "Скривен"
 
+#: ../src/atom_window.py:110
+#, fuzzy, 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Енглески"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Белоруски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Бугарски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Бретански"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Чешки"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Немачки"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Британски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Есперанто"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Шпански"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Баскијски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Француски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Хрватски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Италијански"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Норвешки (б)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Холандски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Норвешки"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Пољски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Португалски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Бразилски португалски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Руски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Српски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Словачки"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Шведски"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
 
-#: ../src/chat_control.py:336
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Језик за правопис"
 
 #. we are not connected
-#: ../src/chat_control.py:359 ../src/chat_control.py:555
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control.py:360 ../src/chat_control.py:556
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control.py:754
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Недефинисан"
 
-#: ../src/chat_control.py:755
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Болестан"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:787
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информације контакта"
 
-#: ../src/chat_control.py:1217 ../src/chat_control.py:1620
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Стварно пошаљи датотеку?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr "Ако пошаљете датотеку контакту %s, он/она ће знати Ваш прави џабер ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG енкрипција омогућена"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1246 ../src/chat_control.py:2115
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:861
-#: ../src/dialogs.py:904 ../src/gajim.py:980 ../src/gajim.py:1640
-#: ../src/normal_control.py:483 ../src/roster_window.py:915
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:1879 ../src/roster_window.py:3110
-#: ../src/roster_window.py:3134 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5441
+#: ../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 "Није на листи контаката"
 
-#: ../src/chat_control.py:1378 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Листа преноса активних, завршених и заустављених датотека"
+
+#: ../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 "Непознат извођач"
 
-#: ../src/chat_control.py:1380 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: ../src/chat_control.py:1386 ../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"
@@ -3023,26 +3146,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> од <i>%(artist)s</i>\n"
 "из <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1391
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s од %(artist)s\n"
-"из %(source)s"
-
-#: ../src/chat_control.py:1515
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1600 ../src/dialogs.py:3912
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3050,50 +3164,50 @@ msgstr ""
 "Ниједан GPG кључ није додаљен овом контакту. Не можете шифровати поруке са "
 "GPG-ом."
 
-#: ../src/chat_control.py:1610
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
 #. encryption %s active
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "је"
 
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "НИЈЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "ће"
 
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "НЕЋЕ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "и аутентификовани"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "и НЕаутентификовани"
 
 #. 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:1667
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3102,26 +3216,26 @@ msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: ../src/chat_control.py:1715
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Команда није подржана за zeroconf  налог."
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Команда: %s"
 
-#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Начин коришћења: /%s, празни текстуални прозор"
 
-#: ../src/chat_control.py:1732 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Начин коришћења: /%s, сакрива дугмад."
 
-#: ../src/chat_control.py:1735 ../src/groupchat_control.py:1688
+#: ../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 "
@@ -3130,63 +3244,63 @@ msgstr ""
 "Начин коришћења: /%(command)s <action>, шаље акцију тренутном групном "
 "разговору. Користититреће лице. (нпр. /%(command)s је експлодирао.)"
 
-#: ../src/chat_control.py:1740
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Начин коришћења: /%s, шаље пинк контакту"
 
-#: ../src/chat_control.py:1743
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Начин коришћења: /%s, шаље поруку контакту"
 
-#: ../src/chat_control.py:1746 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Нема информација ни помоћи за /%s"
 
-#: ../src/chat_control.py:1878
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:1885
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: ../src/chat_control.py:1888
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:1895
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:1897
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:1926 ../src/chat_control.py:1939
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Следећа порука НИЈЕ била шифрована"
 
-#: ../src/chat_control.py:1932
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Следећа порука је била шифрована"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2303
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: ../src/chat_control.py:2304
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3194,15 +3308,15 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: ../src/chat_control.py:2453 ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1218
-#: ../src/gajim.py:174
+#: ../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 "Грешка са базом података"
 
-#: ../src/chat_control.py:2454
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3211,167 +3325,179 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (сав историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2690
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "креирам базу дневника"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 је датотека, али би требала бити фасцикла"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 "Гајим ће се сада завршити"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "креирам фасциклу %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Измени статусне информације"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Измени статус"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Постави тип присутности и опис"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "На вези"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Дуже одсутан"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Не сметај"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Није на вези"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Опис присутности:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Статус се променио."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Напусти групне разговоре"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Ппридружили сте се групном разговору."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Одаберите групне разговоре које желите да напустите"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
-#: ../src/roster_window.py:5033
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Групни разговори"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Напустили сте следеће групне разговоре:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Проследи непрочитане поруке"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Све непрочитане поруке су прослеђене."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Користи ДБус и демон обавештења за приказивање обавештења"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време у минутама, наком кога ће се Ваш статус промеити у Одсутан."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Одсутан, као последица мировања више од $T мин.)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом одсутности."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време у минутама, наком кога ће се Ваш статус промеити у Није доступан."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Није доступан, као последица мировања више од $T мин.)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S ће бити замењено са тренутном статусном поруком,$T са временом "
 "недоступности"
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:452
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3128
+#: ../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 "подразумевано"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Омогући локалну везу/zeroconf поруке"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Језик који користи правопис"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3381,7 +3507,7 @@ msgstr ""
 "'понекад' - исписуј време сваких print_ichat_every_foo_minutes минута.\n"
 "'никад' - никад не исписуј време."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3392,18 +3518,18 @@ msgstr ""
 "најнепрецизнији. Ово се користи само уколико је приказивање_времена "
 "поставњено на 'понекад'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Сматрај * / _ парове као знакове за форматирање."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако је истинито, не уклањај */_ . Тако ће *абв* бити подебљано, али "
 "иокружено са * *."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3414,7 +3540,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ако желите да користите ово, инсталирајте "
 "docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3422,7 +3548,7 @@ msgstr ""
 "Карактер за додавање после надимка када се користи довршавање надимка "
 "(тастером tab) у групном разговору"
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3430,7 +3556,7 @@ msgstr ""
 "Карактер који желите додати после жељеног надимка уколико је жељени надимак "
 "у групном разговору већ употребљен"
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3441,19 +3567,19 @@ msgstr ""
 "документацију за strftime, за пуну документацију: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Карактери који ће бити приказани пре надимка у разговору"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Карактери који ће бити приказани после надимка у разговору"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Додај * и [n] у наслов листе контаката?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3461,11 +3587,11 @@ msgstr ""
 "Колико линија претходног разговора памтити када се прозор/језичак  за "
 "разговор поново отвори."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колико минута да трају линије претходног разговора."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3473,11 +3599,11 @@ msgstr ""
 "Пошаљи поруку са Ctrl+Enter, а са Enter прави нову линију. (Подразумевано "
 "понашање Миралабисовог ICQ клијента)"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колико линија сачувати са Ctrl+KeyUP"
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3486,11 +3612,11 @@ msgstr ""
 "Или Ваш специфицирани УРЛ са %s у њему где је %s реч или фраза или 'ВИКИ-"
 "РЕЧНИК' што значи коришћење вики-речника."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ако је означено, Гајим се може контролисати коришћењем gajim-remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3501,14 +3627,14 @@ msgstr ""
 "рачуна (ако немају listen_to_network_manager постављен на неистинито и "
 "синхронизуј са глобалним статусом) у зависности од статуса мрежне конекције."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Послата обавештења о стању разговора. Може бити једно од "
 "'сви','само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3516,7 +3642,7 @@ msgstr ""
 "Приказана обавештења о стању разговора у прозору за разговор. Може бити "
 "једно од 'сви', 'само_састављање', 'онемогућено'."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3524,11 +3650,11 @@ msgstr ""
 "Ако се не исписује време за сваку поруку (print_time==понекад), исписати га "
 "сваких x минута"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питај пре затварања прозора/језичка групног разговора."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3536,7 +3662,7 @@ msgstr ""
 "Увек питај пре затварања језичка/прозора када је у питању ова листа одвојена "
 "бланко карактерима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3544,7 +3670,13 @@ msgstr ""
 "Никад не питај пре затварања језичка/прозора групног разговора када је у "
 "питању ова листаодовојена бланко знацима џабер ИД-ова групних разговора."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3552,35 +3684,27 @@ msgstr ""
 "Листа хостова одвојена зарезима, коју шаљемо, уз локалне интерефејсе, за "
 "трансфер датотека, у случају прослеђивања порта/НАТовања."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC стандард дефинише КiБ = 1024 бајтова, КБ = 1000 бајтова"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Обавести ме о свим догађајима у икони системске касете."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Прикажи језичак иако је само један разговор?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Прикаши границу свеске у прозорима разговора?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Прикаши дугме за затварање у језичку?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
-"желите да чувате поруке у дневнику?"
-
-#: ../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 "
@@ -3591,18 +3715,18 @@ msgstr ""
 "приоритет, одвојени зарезима. Валидне групе су 1, 2, 5, 14, 15, 16, 17 и 18. "
 "Вишљи бројеви су сугурнији, али тада треба више времена за почетак сесије."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Прегледај нове поруке у искачућим обавештењима?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Листа речи одвојена бланко карактерима које ће бити обојене у групним "
 "разговорима"
 
-#: ../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."
@@ -3610,14 +3734,14 @@ msgstr ""
 "Ако је истинито, Гајим се завршава када се притисне X дугме. Ово подешавање "
 "се користи само ако је икона системске касете у употреби."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ако је истинито, Гајим проверава да ли је подразумевани џабер клијент на "
 "сваком стартовању."
 
-#: ../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."
@@ -3625,7 +3749,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати икону на сваком језичку који садржи "
 "непрочитане поруке. У зависности од теме, икона може бити и анимирана."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3633,12 +3757,12 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати статусну поруку (ако није празна) за "
 "сваки контакт у листи контаката"
 
-#: ../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."
@@ -3646,7 +3770,7 @@ msgstr ""
 "Ако је истинито, Гајим ће послати упит за аватар за сваки контакт који "
 "прошлог пута није  имао аватар или је онај у меморији престар"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3654,7 +3778,7 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: ../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 "
@@ -3668,30 +3792,30 @@ msgstr ""
 "све статусне поруке. Ако је \"in_and_out\". Гајим ће приказивати само поруке "
 "типа тај и тај је ушао/изашао у/из собе."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Боја позадине контакта када тек дођу на везу."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Боја позадине контакта када тек оду са везе."
 
-#: ../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 "Не приказуј аватар за сам транспорт."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: ../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 "
@@ -3701,7 +3825,7 @@ msgstr ""
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3712,7 +3836,7 @@ msgstr ""
 "у групним разговорима"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3731,31 +3855,31 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Сакрива дугмад у прозорима разговора."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Сакрива банер у прозору разговора две особе"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: ../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."
@@ -3763,15 +3887,15 @@ msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: ../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
 msgid "Smooth scroll message in conversation window"
 msgstr "Глатко скроловање у прозору разговора"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3779,11 +3903,11 @@ msgstr ""
 "Листа боја одвојена са \":\" које ће бити коришћене за бојење надимака у "
 "групним разговорима."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab иде на следећи језичак када нема непрочитаних језичака"
 
-#: ../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."
@@ -3791,7 +3915,7 @@ 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 "
@@ -3801,7 +3925,7 @@ 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."
@@ -3809,7 +3933,16 @@ msgstr ""
 "Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
+"ускладишти лозинке налога."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3817,7 +3950,7 @@ 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"
@@ -3825,7 +3958,7 @@ msgstr ""
 "Може бити празно, 'chat' или 'normal'. Ако није празно, третира све долазне "
 "поруке као поруке постављеног типа"
 
-#: ../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."
@@ -3833,7 +3966,7 @@ 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."
@@ -3841,11 +3974,11 @@ msgstr ""
 "Ако је истинито, Гајим ће конвертовати све карактер између $$ и $$ у слику "
 "користећи dvips у ибацити је у прозор разговора."
 
-#: ../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."
@@ -3853,7 +3986,7 @@ 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."
@@ -3861,27 +3994,33 @@ 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
 #, fuzzy
 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 ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri."
 
-#: ../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."
@@ -3889,7 +4028,7 @@ msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: ../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"
@@ -3898,26 +4037,26 @@ msgstr ""
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: ../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 ""
 "Ако је онемогућено, не потписуј присуство са GPG кључем, чак иако је GPG "
 "конфигурисан."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Омогући ESessions енкрипцију за овај налог."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Да ли ће Гајим аутоматски стартовати шифровану сесију ако је могуће?"
 
-#: ../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"
@@ -3925,34 +4064,43 @@ msgstr ""
 "Уређена листа (одвојена зарезима) типова конекције за пробу. Може садржати "
 "tls, ssl или plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
 
-#: ../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
+#, fuzzy
 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 "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."
@@ -3960,19 +4108,27 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: ../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:393
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3980,101 +4136,101 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:395 ../src/common/config.py:398
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "све или размаком одвојен статус"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'да', 'не', или 'обоје'"
 
-#: ../src/common/config.py:406 ../src/common/config.py:408
-#: ../src/common/config.py:409 ../src/common/config.py:412
-#: ../src/common/config.py:413
+#: ../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 "'да', 'не' или ''"
 
-#: ../src/common/config.py:419 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:421 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:423 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:431 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:434 ../src/common/config.py:435
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4083,68 +4239,99 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:459 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Лош хост"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Невалидна локална адреса? :-O"
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1845
-#: ../src/common/connection_handlers.py:1891
-#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1216
-#: ../src/gajim.py:396
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Региструј се на %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Веза прекинута"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1219
-#: ../src/gajim.py:175
+#: ../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 "Неисправан џабер ИД"
+
+#: ../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: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."
@@ -4154,78 +4341,77 @@ msgstr ""
 "(погледајте http://trac.gajim.org/wiki/DatabaseBackup) или  уклоните (сав "
 "историјат порука ће бити изгубљен)."
 
-#: ../src/common/connection_handlers.py:1966
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Недозвољен надимак: %s "
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2041
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:560
+#: ../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 "Није могуће придружити се групном разговору"
 
-#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Забрањен Вам је приступ овом групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групни разговор.%s не постоји."
 
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2055
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Нисте у листи чланова групног разговора %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "сада сте претплаћени на %s"
 
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "захтев за укидање претплате од контакта %s"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "сада Вам је укинута претплата од контакта %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4235,213 +4421,218 @@ msgstr ""
 "Употребите алате као што је http://jru.jabberstudio.org/ да бисте га уклонили"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Лозинка за OpenPGP није унета"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../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 "Повезаћете се на %s без OpenPGP кључа."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Нисам успео да узмем сертификат издавача"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Нисам успео да узмем CRL сертификата"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Нисам успео да дешифрујем потпис сертификата"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Нисам успео да дешифрујем CRL сертификата"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Нисам успео да декодирам јавни кључ издавача"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Грешка у потпису сертификата"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "Грешка у CRL сертификата"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Сертификат још није валидан"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Сертификат је истекао"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "CRL није још валидан"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "CRL је истекао"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Грешка у формату сертифаковог поља од када је валидан"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Грешка у формату сертифаковог поља до када је валидан"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Грешка у формату CRL-овогпоља последњег ажурирања"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Грешка у формату CRL-овогпоља следећег ажурирања"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Немам више меморије"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Самопотписани сертификат"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Самопотписани сертификат у ланцу сертификата"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "У немогућности да узмем сертификат локалног издавача"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "У немогућности да верификујем први сертификат"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Ланац сертификата предугачак"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Сертификат повучен"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Неисправан сертификат сертификационог тела (CA)"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Прекорачена дужина путање"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Неподржана сврха сертификата"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Сертификату се не верује"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Сертификат одбачен"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Погрешна тема издавача сертификата"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Идентификатор кључа ауторизатора и теме се не поклапају"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Серијски број ауторизатора и издавача се не поклапају"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "Употреба кључа не укључује потписивање сертификата"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Веза са проксијем прекинута"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1351
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1057
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Сачувано у: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Веза са проксијем прекинута"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са %s није могућа"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4450,7 +4641,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4459,24 +4650,24 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Проверите Вашу конекцију или покушајте касније"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Аутентикација са \"%s\" неуспешна"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4485,25 +4676,30 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1095
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 "Није могуће послати празну датотеку"
+
+#: ../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:1097
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 "Кључ контакта (%s) не поклапа се са кључем придруженим у Гајиму."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1106
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
 
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4512,20 +4708,30 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1384
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Позови контакте"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
-#: ../src/gajim.py:980
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Посматрачи"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:806 ../src/roster_window.py:818
-#: ../src/roster_window.py:1470 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1676
+#: ../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 "Преноси"
 
@@ -4534,11 +4740,11 @@ msgid "Not in roster"
 msgstr "Није у листи контаката"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На овом рачунару недостају python везивања за D-Bus"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus могућности Гајима се не могу користити"
 
@@ -4568,356 +4774,356 @@ msgstr ""
 "Линија сесије није доступна.\n"
 "Прочитајте http:/trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "дванаест"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "један"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "два"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "три"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "четири"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "пет"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "шест"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "седам"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "осам"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "девет"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "десет"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "једанаест"
 
+#. 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 "дванаест"
+msgid "%(0)s o'clock"
+msgstr "%(0)s сати"
 
-#. 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 сати"
-
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 и пет"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s и пет"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 и десет"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s и десет"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 и петнаест"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s и петнаест"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 и двадесет"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s и двадесет"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 и двадесет и пет"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s и двадесет и пет"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 i тридесет минута"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s i тридесет минута"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "двадесет и пет до $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "двадесет и пет до %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "двадесет до $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "двадесет до %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "петнаест минута до $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "петнаест минута до %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "десет до $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "десет до %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "пет до $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "пет до %(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 "Ноћ"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Рано јутро"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Јутро"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Скоро подне"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Подне"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Послеподне"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Вече"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Касно вече"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Почетак недеље"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Средина недеље"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Крај недеље"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Потребна је адреса сервера."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Доступан"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Доступан"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Није на вези"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Обоје"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Учесници"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Учесник"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Члан"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "пише поруку..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4925,22 +5131,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " из собе %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " од корисника %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " од %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4948,665 +5154,675 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Грешка приликом извршавања \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s није исправан ниво логовања"
+
 #. 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 "грешка: не могу отворити %s за читање"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Гајим налог %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "налога %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Уплашен"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Одушевљен"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Заљубљен"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Љут"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Изнервиран"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Анксиозан"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Напаљен"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Посрамљен"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Сморен"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Храбар"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Миран"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Опрезан"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Смрзнут"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Поуздан"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Збуњен"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Задубљен у мисли"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Задовољан"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "На крају живаца"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Луд"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Креативан"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Заинтересован"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Потиштен"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Депресиван"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Разочаран"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Згађен"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Скрхан"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Ометен"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Постиђен"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Завидљив"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Узбуђен"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "За флертовање"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Фрустриран"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Захвалан"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "У патњи"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Мргудан"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Крив"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Срећан"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "У надању"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Наложен"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Скроман"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Понижен"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Гладан"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Повређен"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Импресиониран"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Очаран"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Заљубљен"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Озлојеђен"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Заинтересован"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Отрован"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Непобедив"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Љубоморан"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Усамљен"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Изгубљен"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Срећан"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Злобан"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Расположен"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Нервозан"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Неутралан"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Увређен"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Побеснео"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Играо би се"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Поносан"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Опуштен"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Олакшан"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Самилостан"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Неуморан"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Тужан"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Саркастичан"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Задовољан"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Озбиљан"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Шокиран"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Стидљив"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Болестан"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Поспан"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Спонтан"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Под стресом"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Јак"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Изненађен"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Захвалан"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Жедан"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Уморан"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Недефинисан"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Слаб"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Забринут"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Обавља рутину"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Купује намирнице"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Чисти"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Кува"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Обавља одржавање"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Пере судове"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Пере веш"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Баштовани"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "На задатку"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Шета пса"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Пије"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Пије пиво"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Пије кафу"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Пије чај"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Ужина"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Доручкује"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Руча"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Вечера"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Вежба"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Вози бициклу"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Плеше"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Шета"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Џогира"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Бави се спортом"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Трчи"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Скија"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Плива"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Вежба"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Чешља се"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "У бањи"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Пере зубе"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Шиша се"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Брије се"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Купа се"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Тушира се"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Састанчи"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Слободан дан"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Блеји"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Крије се"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "На одмору"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Моли се"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Заказани одмор"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Размишља"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Одмара се"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Пеца"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Игра игрице"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Излази напоље"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "На проводу"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Чита"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Увежбава"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "У шопингу"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Пуши"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Дружи се"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Сунча се"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Гледа ТВ"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Гледа филм"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Прича"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "У стварном животу"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Телефонира"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "На видео телефону"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Путује"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Мува се"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Вози"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "У колима"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "У аутобусу"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "У авиону"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "У возу"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "На путу"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Шета"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Програмира"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "На састанку"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Учи"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Пише"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Не могу да се повежем на порт %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5614,14 +5830,14 @@ msgstr ""
 "Можда већ имате покренуту инстанцу Гајима. Пренос датотека ће бити прекинут."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ово је део шифроване сесије. Уколико видите ово, нешто је пошло наопако.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5630,17 +5846,17 @@ msgstr ""
 "Хост %s који сте поставили као ft_add_host_to_send напредно подешавање није "
 "исправан. па је игнорисан."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Ако желите наставити са слањем и примањем порука, морате се искључити и "
 "поново доћи на везу."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Авахи грешка"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5649,31 +5865,31 @@ msgstr ""
 "%s\n"
 "Поруке локалне мреже можда неће радити како треба."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Проверите да ли је Авахи или Bonjour инсталиран."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Није могуће покренути локални сервис"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Не могу се повезати на порт %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Молимо проверите да ли је avahi-демон покренут."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Није могуће променити статус рачуна \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5681,65 +5897,49 @@ msgstr ""
 "Нисте спојени или сте невидљиви за друге. Ваша порука не може бити послата."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Ова порука је шифрована]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Ваша порука није могла бити послата."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Контакт није на вези. Вашу поруку није могуће послати."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Није могуће остварити везу са хостом: Време за слање података је истекло."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Грешка приликом додавања сервиса. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Онемогућено"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Активно"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "догађај"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Подразумевана порука"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr "Увек користи апликацију коју оперативни систем нуди"
-
-#: ../src/config.py:455
-msgid "Custom"
-msgstr "Кориснички"
-
-#: ../src/config.py:650 ../src/dialogs.py:1200
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5748,252 +5948,211 @@ msgstr ""
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "текст статусне поруке"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Примљена Прва Порука"
-
-#: ../src/config.py:1054
-msgid "Next Message Received Focused"
-msgstr "Следећа Примљена Порука Фокусирана"
-
-#: ../src/config.py:1056
-msgid "Next Message Received Unfocused"
-msgstr "Следећа Примљена Порука Нефокусирана"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Контакт На Вези"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Контакт Отишао Са Везе"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Порука Послата"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Бојење Порука Са Групног Разговора"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Примљена Порука Са Групног Разговора"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Примљен Гмаил е-мејл"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
-#: ../src/disco.py:770 ../src/disco.py:1564 ../src/disco.py:1811
-#: ../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 "Име"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: ../src/config.py:1531 ../src/config.py:1630
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Неисправан џабер ИД"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Дошло је до проблема у узимању Ваших OpenPGP тајних кључева."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1676 ../src/dialogs.py:1812
-#: ../src/dialogs.py:1991 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Нисте повезани на сервер"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6001,11 +6160,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6013,11 +6172,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6025,11 +6184,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6037,14 +6196,15 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Може бити једно од следећег:\n"
 "1. корисник@домен/ресурс (поклапа се само са тим ресурсом).\n"
@@ -6053,83 +6213,88 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1429 ../src/roster_window.py:1942
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1916
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1943
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
-msgstr "Неисправно корисничко име"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Неисправан надимак"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Недозвољен надимак: %s "
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Дуплирај Џабер ИД"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Неисправан сервер"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Овај налог је већ конфигурисан у Гајиму."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Неисправан унос"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6138,24 +6303,32 @@ msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3137
-msgid "Invalid server"
-msgstr "Неисправан сервер"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Ваш нови налог је успешно направљен"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Неисправно корисничко име"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3138
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3189 ../src/gajim.py:2007
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3190 ../src/gajim.py:2008
+#: ../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 "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6170,7 +6343,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3264 ../src/gajim.py:2031
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6181,23 +6354,63 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Ваш нови налог је успешно направљен"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Активно"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "догађај"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Примљена Прва Порука"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Следећа Примљена Порука Фокусирана"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Следећа Примљена Порука Нефокусирана"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Контакт На Вези"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Контакт Отишао Са Везе"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Порука Послата"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Бојење Порука Са Групног Разговора"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Примљена Порука Са Групног Разговора"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Примљен Гмаил е-мејл"
+
+#: ../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"
@@ -6207,7 +6420,7 @@ msgstr ""
 "стигла на други крај. Ако ова икона остане овако \n"
 "дуго времена, вероватно је да се порука изгубила."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6215,74 +6428,74 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:692
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Излаз"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:704
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "УРЛ-у Речника недостаје \"%s\" и није Вики речник"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
-#: ../src/conversation_textview.py:1015 ../src/conversation_textview.py:1033
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Грешка приликом извршавања \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1290
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1294
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Пре %i дана"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1328
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Џабер ID већ у листи контаката"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Џабер ID који сте унели је већ на листи. Одаберите неки други."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6297,27 +6510,27 @@ msgstr "Име контакта: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Џабер ИД: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "У групи"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "ИД Кључа"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Име контакта"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Постави расположење"
 
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Статусна порука"
@@ -6326,114 +6539,114 @@ msgstr "%s Статусна порука"
 msgid "Status Message"
 msgstr "Статусна порука"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Препиши статусну поруку?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ово име се већ користи. Да ли желите да препишете ову статусну поруку?"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Сними као већ постављену статусну поруку"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Молимо унесите име за ову статусну поруку"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "АИМ адреса:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "ГГ Број:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Број:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN адреса:"
 
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! адреса:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "ГТК+ џабер клијент"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1014
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1020
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1026
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Последње, али не и најмање важно, желели бисмо захвалити свим одржаватељима "
 "пакета"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1039
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6446,88 +6659,88 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1605
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Надимак садржи недозвољене карактере."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:1608
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:1669 ../src/gajim.py:2631
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:1696
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:1767
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-msgid "The nickname has not allowed characters."
-msgstr "Надимак садржи недозвољене карактере."
-
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:1813
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:1827
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:1946
+#: ../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:"
@@ -6536,275 +6749,300 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2346 ../src/dialogs.py:2489
-#: ../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 "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2016
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2056 ../src/notify.py:245 ../src/notify.py:472
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: ../src/dialogs.py:2058 ../src/notify.py:253 ../src/notify.py:474
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #. chat message
-#: ../src/dialogs.py:2060 ../src/notify.py:276 ../src/notify.py:476
-#: ../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 "Нова Порука"
 
 #. single message
-#: ../src/dialogs.py:2060 ../src/notify.py:257 ../src/notify.py:476
-#: ../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 "Нова Самостална Порука"
 
 #. private message
-#: ../src/dialogs.py:2061 ../src/notify.py:264 ../src/notify.py:477
-#: ../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 "Нова Приватна Порука"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1594 ../src/notify.py:485
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1660 ../src/notify.py:479
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1560 ../src/gajim.py:1627
-#: ../src/notify.py:481 ../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 "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1702 ../src/gajim.py:1724
-#: ../src/gajim.py:1741 ../src/notify.py:483 ../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 "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1705 ../src/notify.py:483
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2070 ../src/gajim.py:1450 ../src/notify.py:487
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: ../src/dialogs.py:2072 ../src/notify.py:237 ../src/notify.py:489
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2268 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2271 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2294 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2317 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Форма %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2389 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2390 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Конзола"
 
-#: ../src/dialogs.py:2560
+#. 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 "Желио бих да Вас додам на листу мојих контаката."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Расположен"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Џабер ИД:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Група"
+
+#. 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 "Желео бих да те додам на моју листу контаката."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2564
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:2620
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Редослед: %(order)s, акција: %(action)s, тип: %(type)s, вредност: %(value)s"
 
-#: ../src/dialogs.py:2625
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:2667
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:2850
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:2923
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Услов"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "када сам "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6815,19 +7053,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска ове сесије је: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Идентитет контакта потврђен"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Потврдите поново..."
 
-#: ../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 "
@@ -6837,19 +7075,19 @@ 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 "Идентитет контакта НИЈЕ потврђен"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Потврди..."
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет контакта?"
 
-#: ../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> "
@@ -6863,22 +7101,22 @@ msgstr ""
 "да ли и он има исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска ове сесије: <b>%(sas)s</b>."
 
-#: ../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 ""
 "Кључ контакта (%s) <b>не поклапа се</b> са кључем придруженим у Гајиму."
 
-#: ../src/dialogs.py:3913
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../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."
@@ -6887,7 +7125,7 @@ msgstr ""
 "поруке <b>не могу</b> бити шифроване. Употребите Вашег GPG клијента да дате "
 "поверење овом кључу."
 
-#: ../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."
@@ -6895,33 +7133,33 @@ msgstr ""
 "GPG кључ је додељен овом контакту и Ви верујете овом кључу тако да ће поруке "
 "бити шифроване."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Остали"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Конференција"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6929,218 +7167,242 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Преглед"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Изврши наредбу"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Скенирање %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1574
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Корисници"
 
 #. Description column
-#: ../src/disco.py:1582
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1590
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Идентификација"
 
-#: ../src/disco.py:1820
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Маркер је већ постављен"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Групни разговор \"%s\" је већ маркиран."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Маркер успешно додат"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
+"контаката."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: ../src/disco.py:1828
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Чвор"
 
-#: ../src/disco.py:1885
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Нова објава"
 
-#: ../src/disco.py:1891
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: ../src/disco.py:1897
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Грешка SSL сертификата"
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Библиотека која се користи да провери сертификате сервера и осигура сигурну "
 "везу."
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Захтева python-pyopenssl."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Разговор без сервера са аутодетекцијом клијената у локалној мрежи."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Захтева python-avahi."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Захтева pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Команда: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипта за контролу Гајима из командне линије."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Захтева python-dbus."
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 "Могућност није доступна под Виндоуз системом."
 
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenPGP"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрујем поруке разговора са gpg кључевима."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Захтева gpg и python-GnuPGInterface."
 
-#: ../src/features_window.py:67
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Аутодетекција статуса мреже."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Захтева gnome-network-manager и python-dbus."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Менаџмент сесија"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Гајим сесија је сачувана на прекиду везе и учитана по логовању."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Захтева python-gnome2."
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Лозинка за улазак у собу"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Лозинке се могу сачувати и поузданије од обичног текста."
 
-#: ../src/features_window.py:77
-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 "Захтева gnome-keyring and python-gnome2-desktop."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Даје могућност конекције на сервере који користе SRV записе."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Захтева dnsutils."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Захтева nslookup да бисте користили SRV записе."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Провера правописа"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Провера правописа састављених порука."
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Захтева python-gnome2-extras или компајлирање gtkspell модула из Гајим "
-"изворног кода."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Захтева python-sexy."
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Обавештења"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Пасивна искачућа обавештења о новим догађајима."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7148,48 +7410,54 @@ msgstr ""
 "Захтева python-notify или, уместо тога python-dbus у спрези са notification-"
 "daemon."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Икона системске касете"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Икона у системској касети одражава тренутно стање."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Захтева python-gnome2-extras или компајлирање trayicon модула из Гајим "
 "изворног кода."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Захтева PyGTK >= 2.10."
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "У стању мировања"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Подеси према статусу"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Даје могућност мерења времена када се ништа не дешава, да се одреди ауто "
 "статус."
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Захтева компајлирање idle модула из Гајим изворног кода."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
+msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Захтева python-gnome2."
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Претвара LaTeX изразе између $$ $$."
 
-#: ../src/features_window.py:101
+#: ../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."
@@ -7197,7 +7465,7 @@ msgstr ""
 "Захтева texlive-latex-base, и dvipng. Морате подесити'use_latex' на True у "
 "едитору напредних подешавања."
 
-#: ../src/features_window.py:102
+#: ../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."
@@ -7205,23 +7473,25 @@ msgstr ""
 "Захтева texlive-latex-base и dvipng (све из MikTeX-а). Морате "
 "подесити'use_latex' на True у едитору напредних подешавања."
 
-#: ../src/features_window.py:103
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Енкрипција с краја на крај"
 
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Шифрујем поруке разговора."
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Захтева python-crypto."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "РСТ генератор"
 
-#: ../src/features_window.py:108
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7229,24 +7499,24 @@ msgstr ""
 "Генерише XHTML излаз од RST кода (погледати http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Захтева python-docutils."
 
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Даје могућност да имате линкове на које се може кликнути у разговорима."
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Захтева python-sexy."
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Могућност"
 
@@ -7275,7 +7545,7 @@ msgstr "Величина: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Ви"
 
@@ -7285,7 +7555,7 @@ msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Примаоц: "
 
@@ -7317,26 +7587,27 @@ msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Пренос датотеке је заустављен од контакта са друге стране"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Пренос датотеке заустављен"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Одаберите датотеку за слање..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Опис:"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Гајим не може приступити овој датотеци"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Ову датотеку користи неки други процес."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Датотека: %s"
@@ -7356,33 +7627,33 @@ msgstr "Опис: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Вам жели послати датотеку:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr "Датотека са овим именом већ постоји и немате привилегијапреписати је."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Шта желите да урадите?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
@@ -7418,48 +7689,52 @@ msgstr "Датотека: "
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:87
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s није исправан ниво логовања"
-
-#: ../src/gajim.py:160
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Гајиму треба X сервер да би се покренуо. Завршавам..."
 
-#: ../src/gajim.py:190
-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 "Гајиму треба pyГТК 2.8 или већа верзија"
 
-#: ../src/gajim.py:191
-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 "Гајиму треба pyГТК 2.8 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:193
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Гајиму треба pyГТК 2.8 или већа верзија"
 
-#: ../src/gajim.py:194
-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 "Гајиму треба pyГТК 2.8 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "ГТК+ нема подршку за libglade"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7468,21 +7743,21 @@ msgstr ""
 "Молимо уклоните Ваш тренутни ГТК+ и инсталирајте последњу стабилну верзију "
 "са %s"
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Молимо проверите да ГТК+ и PyГТК имају подршку за libglade на Вашем систему"
 
-#: ../src/gajim.py:208
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Гајиму треба PySQLite2 за покретање"
 
-#: ../src/gajim.py:216
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Гајиму треба pywin32 за покретање"
 
-#: ../src/gajim.py:217
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7492,11 +7767,11 @@ msgstr ""
 "наћи на %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:370
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Гајим је већ покренут"
 
-#: ../src/gajim.py:371
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7504,25 +7779,35 @@ msgstr ""
 "Једна инстанца Гајима изгледа већ ради\n"
 "Свеједно желите покренути?"
 
-#: ../src/gajim.py:497
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Нема додељеног GPG кључа"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Повезаћете се на %s без OpenPGP кључа."
+
 #. ask again
-#: ../src/gajim.py:513
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: ../src/gajim.py:514
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7533,50 +7818,59 @@ msgstr ""
 "регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: ../src/gajim.py:575
+#: ../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 "Прихватате ли овај захтев?"
 
-#: ../src/gajim.py:577
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: ../src/gajim.py:628 ../src/notify.py:491 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: ../src/gajim.py:934 ../src/gajim.py:938
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Грешка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:948 ../src/gajim.py:962
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:994
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Захтев за претплатом"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: ../src/gajim.py:1015
+#: ../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?"
@@ -7584,74 +7878,79 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: ../src/gajim.py:1056
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Укини претплату"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: ../src/gajim.py:1232 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: ../src/gajim.py:1250 ../src/groupchat_control.py:1339
-#: ../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 је тренутно %(status)s"
 
-#: ../src/gajim.py:1313
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(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:1377 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: ../src/gajim.py:1385
+#: ../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:1388
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Логовање у соби је сада омогућено"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Логовање у соби је сада онемогућено"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: ../src/gajim.py:1430
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
 
-#: ../src/gajim.py:1464
+#: ../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"
@@ -7659,20 +7958,48 @@ msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Ваша лозинка није тачна"
 
-#: ../src/gajim.py:1571
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG није употребљив"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
+
+#: ../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 "_Не питај ме више"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring је инсталиран, али није \t\t\t\t\t\t\tправилно стартован"
+"(променљиве окружења вероватно нису \t\t\t\t\t\t\tправилно подешене)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нови е-мејл за %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7680,7 +8007,7 @@ msgstr[0] "Имате %d нови е-мејл разговор"
 msgstr[1] "Имате %d нова е-мејл разговора"
 msgstr[2] "Имате %d нових е-мејл разговора"
 
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7695,34 +8022,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1657
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Уклања контакт са листе"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Грешка при читању датотеке:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1746
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7731,36 +8068,36 @@ msgstr ""
 "Не могу да дешифрујем поруку од контакта %s\n"
 "Можда је промењена."
 
-#: ../src/gajim.py:1841
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: ../src/gajim.py:1912
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: ../src/gajim.py:1913
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s s.)"
 
-#: ../src/gajim.py:1949
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gajim.py:1974
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: ../src/gajim.py:1975
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7768,11 +8105,11 @@ msgstr ""
 "Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
 "ново име ресурса"
 
-#: ../src/gajim.py:2028
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: ../src/gajim.py:2029
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7783,19 +8120,19 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: ../src/gajim.py:2050
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7807,11 +8144,11 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: ../src/gajim.py:2072 ../src/gajim.py:2102
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7819,16 +8156,11 @@ msgstr ""
 "Управо ћете послати лозинку преко нешифроване везе. Јесте ли сигурни да "
 "желите то да урадите?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: ../src/gajim.py:2076 ../src/gajim.py:2106 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3789
-msgid "Do _not ask me again"
-msgstr "_Не питај ме више"
-
-#: ../src/gajim.py:2103
+#: ../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?"
@@ -7836,27 +8168,27 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP чвор није уклоњен"
 
-#: ../src/gajim.py:2121
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2589 ../src/gajim.py:2610
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/gajim.py:2590
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: ../src/gajim.py:2611
+#: ../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 "
@@ -7866,57 +8198,38 @@ msgstr ""
 "emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
 "више детаља."
 
-#: ../src/gajim.py:2637 ../src/roster_window.py:3323
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Немогуће је приступити групном разговору ако сте невидљиви"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2917
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: ../src/gajim.py:3014
-msgid "Bookmark already set"
-msgstr "Маркер је већ постављен"
-
-#: ../src/gajim.py:3015
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Групни разговор \"%s\" је већ маркиран."
-
-#: ../src/gajim.py:3028
-msgid "Bookmark has been added successfully"
-msgstr "Маркер успешно додат"
-
-#: ../src/gajim.py:3029
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
-"контаката."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Приказује помоћ за одређену наредбу"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "наредба"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "прикажи помоћ за команду"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Приказује или скрива прозор листе контаката "
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Искаче прозор са следећим догађајем на чекању"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7924,49 +8237,50 @@ msgstr ""
 "Исписује листу свих контаката са листе контаката. Сваки контакт је у "
 "посебној линији"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "налог"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "приказује само контакте са овог налога"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Исписује листу регистрованих налога"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Мења статус једног или више налога"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "статус"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "порука"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "статусна порука"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -7975,19 +8289,23 @@ msgstr ""
 "свих налога који имају укључену опцију \"синхронизација са глобалним статусом"
 "\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Приказује дијалог разговора како бисте могли разговарати са контактом"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "Џабер ИД контакта са којим желите разговарати"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ако је назначено, контакт се узима са листе контаката овог налога"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7997,29 +8315,29 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Џабер ИД контакта који ће примити поруку"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "садржај поруке"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp кључ"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ако је назначено, порука ће бити шифрована користећи овај јавни кључ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ако је назначено, порука ће бити послата користећи овај налог"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8029,135 +8347,135 @@ msgstr ""
 "желите поставити само 'налог', без 'OpenPGP кључ', само поставите 'OpenPGP "
 "кључ' на ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "тема поруке"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Шаље нову поруку на групни разговор коме сте се придружили."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "Џабер ИД собе која ће примити поруку"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Даје детаљне информације о контакту"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "Џабер ИД контакта"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Даје детаљне информације о налогу"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Име налога"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Шаље датотеку контакту"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "датотека"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Путања до датотеке"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ако је назначено, датотека ће бити послата коритећи овај налог"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Приказује сва подешавања и њихове вредности"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Поставља вредност 'кључа' на 'вредност'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "кључ=вредност"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'кључ' је име ставке подешавања, 'вредност' је вредност на коју ће се ставка "
 "поставити"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Брише ставку подешавања"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "кључ"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "име ставке подешавања које ће се брисати"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записује тренутно стање Гајим подешавања у .config датотеку"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Уклања контакт са листе"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Додаје контакт на листу"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "џид"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Додаје нови контакт овом рачуну"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Враћа тренутни статус (глобални ако није назначен налог)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Враћа тренутну статусну поруку (глобалну ако није назначен налог)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Враћа број непрочитаних порука"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Отвара дијалог за започињање разговора"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Започиње разговор, користећи овај налог"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Шаље кориснички дефинисан XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML за слање"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8165,67 +8483,72 @@ msgstr ""
 "Налог за који ће бити послан xml ; ако није одређен, xml ће бити послат за "
 "све налоге"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Управља xmpp:/ uri-јем"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI за управљање"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Налог у коме желите да управљате њиме"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "садржај поруке"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Придружи се новој соби"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "соба"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Џабер ID собе:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "надимак"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Надимак за коришћење"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "лозинка"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Лозинка за улазак у собу"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Налог са кога желите да уђете у собу"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8234,15 +8557,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8251,16 +8574,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8269,7 +8592,7 @@ msgstr ""
 "Коришћење: %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8278,7 +8601,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8287,7 +8610,7 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Лош uri"
 
@@ -8304,181 +8627,185 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Молимо Вас направите нову чисту тему са жељеним именом."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "име теме"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Не можете избрисати Вашу тренутну тему"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Више нисте у групном разговору \"%(room)s\" или је \"%(nick)s\" отишао."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr "Стварно пошаљи датотеку?"
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Ако пошаљете датотеку контакту %s, он/она ће знати Ваш прави џабер ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s је избачен од стране %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../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 је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Афилијација %(nick)s је постављена на %(affiliation)s од стране %(actor)s"
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s од стране %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-msgid "Invalid nickname"
-msgstr "Неисправан надимак"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Надимак није пронађен: %s "
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Овај групни разговор нема тему"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Позвали сте %(contact_jid)s у собу %(room_jid)s"
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Надимак није пронађен: %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 ""
 "Коришћење: /%s <надимак|џид> [разлог], забрањује приступ ЏИД-у у собу. "
 "Надимак учесника може бити замењен, али не и ако садржи \"@\". Ако је Џабер "
 "ИД тренутно у соби, он/она ће бити избачен(а). Размаци у именима НИСУ "
 "подржани."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr "Начин коришћења: /%s <надимак>, отвара приватни разговор са учесником."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8487,7 +8814,7 @@ msgstr ""
 "Начин коришћења: /%s [разлог], затвара тренутни прозор или језичак, и "
 "приказује разлог ако је назначен."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8496,7 +8823,7 @@ msgstr ""
 "Начин коришћења: /%s ЏИД> [разлог], позива Џабер ИД у тренутни групни "
 "разговор, опционо дајући разлог."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8505,18 +8832,17 @@ msgstr ""
 "Начин коришћења: /%s <соба>@<сервер>[/надимак], нуди могућност спајања на "
 "соба@сервер користећи наведени надимак."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Начин коришћења: /%s <надимак> [разлог], уклања учесника са задатим надимком "
 "из групног разговора и опционо приказује разлог. НЕ подржава бланко знакове "
 "у надимку."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8525,64 +8851,80 @@ msgstr ""
 "Начин коришћења: /%s <надимак> [порука], отвара прозор приватне поруке и "
 "шаље поруку учеснику са задатим надимком."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
 "разговору."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Начин коришћења: /%s , приказује имена учесника у групном разговору."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Начин коришћења: /%s [тема], приказује или ажурира тему групног разговора."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Начин коришћења: /%s <порука>, шаље поруку не гледајући остале команде."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 ""
+"Начин коришћења: /%s <надимак>, мења Ваш надимак у тренутном групном "
+"разговору."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8590,22 +8932,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2390
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2389
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -8634,83 +8976,83 @@ msgstr "Детаљи"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Грешка при читању датотеке:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Грешка при учитавању датотеке"
 
 #. 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 "Није могуће писати у %s. Управљање сесијама неће бити могуће"
 
 #. 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 "Гајим није Ваш подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Желите ли да Вам Гајим постане подразумевани Гајим клијент?"
 
-#: ../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 ""
 "Увек на стартовању проверавај да ли је Гајим подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Екстензија није подржана"
 
-#: ../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 ""
 "Слику није могуће сачувати у %(type)s формату. Сачувати као %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Сними слику као..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Датум"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Надимак"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Желите ли почистити базу података? (НЕ ПРЕПОРУЧУЈЕ СЕ АКО ЈЕ ГАЈИМ ПОКРЕНУТ)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8724,16 +9066,16 @@ msgstr ""
 "\n"
 "Уколико притисните Да, молимо сачекајте..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Извожење дневника историјата..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)s каже: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Да ли заиста желите избрисати дневник разговора означеног контакта?"
@@ -8741,11 +9083,11 @@ msgstr[1] ""
 "Да ли заиста желите избрисати дневнике разговора означених контаката?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Ова операција је неповратна."
 
-#: ../src/history_manager.py:585
+#: ../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] "Да ли заиста желите да избришете означену поруку?"
@@ -8776,122 +9118,133 @@ msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Нисте повезани на сервер"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Да ли заиста желите да избришете означену поруку?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Поруке"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr "- поруке ће бити логоване"
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr "- поруке неће бити логоване"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нова самостална порука од контакта %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Нова приватна порука са групног разговора %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 "Нова порука од %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Опште"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Игнориши"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2786
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2789
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2791 ../src/roster_window.py:2802
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Информације примљене"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Ако нисте на вези, не можете објавити Баше информације"
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Слање профила..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Информације НИСУ објављене"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Публикација vCard неуспела"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -8899,54 +9252,46 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:944
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1859
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1880
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:1919
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring је инсталиран, али није \t\t\t\t\t\t\tправилно стартован"
-"(променљиве окружења вероватно нису \t\t\t\t\t\t\tправилно подешене)"
-
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1949
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:2118 ../src/roster_window.py:3266
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../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?"
@@ -8954,15 +9299,28 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2145
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2283 ../src/roster_window.py:2520
+#: ../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 "Јесте ли сигурни да желите напустити групни разговор \"%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 "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2284
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8970,16 +9328,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2524
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8987,11 +9345,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2528
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2533
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9001,51 +9359,56 @@ msgstr ""
 "транспорта: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2667
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2675
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2773
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3131
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9054,11 +9417,11 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3136
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: ../src/roster_window.py:3140
+#: ../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."
@@ -9066,16 +9429,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3143
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3147
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3151
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9085,21 +9448,21 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3190
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:3707
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:3709
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9107,13 +9470,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:3783
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:3785
+#: ../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 "
@@ -9123,11 +9486,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:3898
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:3909
+#: ../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:"
@@ -9135,128 +9498,130 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Послате %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Шаље датотеку контакту"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4586 ../src/roster_window.py:4657
-#: ../src/roster_window.py:4666 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4673
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4678
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:4715 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4735
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:4775
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:4837 ../src/roster_window.py:4946
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:4864
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:4871
-msgid "Mood"
-msgstr "Расположење"
-
-#: ../src/roster_window.py:4875
-msgid "Activity"
-msgstr "Активност"
-
-#: ../src/roster_window.py:4880
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
 #. Send Group Message
-#: ../src/roster_window.py:5042 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5050
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5054
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Желео бих Вас додати на моју листу контаката"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5587
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
 #. Send single message
-#: ../src/roster_window.py:5648
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5704
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5712
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5794
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
-#: ../src/roster_window.py:5874
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Нови групни разговор"
 
 #. History manager
-#: ../src/roster_window.py:5987
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:5996
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:6206
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
@@ -9273,20 +9638,20 @@ msgstr "Грешка у примању форме за податке"
 msgid "No result"
 msgstr "Нема резултата"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Грешка при упису на диск"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9301,7 +9666,7 @@ msgstr ""
 "\n"
 "\tДа ли су ове ставке прихватљиве?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9316,124 +9681,116 @@ msgstr ""
 "\n"
 "Наставити са сесијом?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Промени статусну поруку..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "Џабер ИД: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../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 овог групног разговора"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [умањен]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Последњи статус: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " од %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "На вези"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Ван везе"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Претплата: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Расположење:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Активност:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Песма:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Скидање"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Слање"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Пренешено: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Није почео"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Заустављен"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Завршен"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?статус преноса:Паузиран"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Застој"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Пренос у току"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Овај сервис још није пружио детаљне информације"
 
-#: ../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"
@@ -9449,16 +9806,21 @@ msgstr "?Клијент:Непознат"
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Клијент:Непознат"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "од %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9466,7 +9828,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9474,13 +9836,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9488,14 +9850,105 @@ msgstr ""
 "Не интересује Вас присутност контакта, нити Ваша присутност интересује њега/"
 "њу"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
+
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Кликните да видите могућности (као што су MSN, ICQ транспорти) џабер "
+#~ "сервера "
+
+#~ msgid "Servers Features"
+#~ msgstr "Могућности сервера"
+
+#~ msgid "Your JID:"
+#~ msgstr "Ваш џабер ИД:"
+
+#~ msgid "Name:"
+#~ msgstr "Име:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Хост:"
+
+#~ msgid "Show _roster"
+#~ msgstr "_Прикажи листу контаката"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Одаберите налог са којим желите да се синхронизујете"
+
+#~ msgid "Modify Account"
+#~ msgstr "Измени налог"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s од %(artist)s\n"
+#~ "из %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Гајим налог %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#~ msgid "Custom"
+#~ msgstr "Кориснички"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Дуплирај Џабер ИД"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Овај налог је већ конфигурисан у Гајиму."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Захтева python-gnome2-extras или компајлирање gtkspell модула из Гајим "
+#~ "изворног кода."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "У стању мировања"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Захтева компајлирање idle модула из Гајим изворног кода."
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Пренос датотеке је заустављен од контакта са друге стране"
+
+#~ msgid "Generic"
+#~ msgstr "Опште"
+
+#~ msgid "Mood"
+#~ msgstr "Расположење"
+
+#~ msgid "Activity"
+#~ msgstr "Активност"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 1204979b0..9516d6899 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -4,13 +4,13 @@
 # This file is distributed under the same license as the gajim package.
 #
 # B. Kokanovic <branko.kokanovic@gmail.com>, 2007.
-# Branko Kokanovic <branko.kokanovic@gmail.com>, 2008.
+# Branko Kokanovic <branko.kokanovic@gmail.com>, 2008, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-01 16:14+0100\n"
-"PO-Revision-Date: 2008-12-01 21:36+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:05+0200\n"
 "Last-Translator: Branko Kokanovic <branko.kokanovic@gmail.com>\n"
 "Language-Team:  <sr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -42,7 +42,7 @@ msgid "_Add Contact..."
 msgstr "_Dodaj kontakt..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "_Otkrivanje servisa"
 
@@ -63,7 +63,7 @@ msgid "_Personal Events"
 msgstr "Lični događaji"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 msgid "_Start Chat..."
 msgstr "_Započni razgovor"
 
@@ -95,6 +95,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Molimo odaberite 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"
@@ -102,61 +106,54 @@ msgstr ""
 "Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
 "SHA1 potpis sertifikata:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr ""
-"Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti) džaber "
-"servera "
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Koristi autentikaciju"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Poveži se kada pritisnem Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: čarobnjak za kreiranje naloga"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Već imam nalog koji želim da koristim"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Želim da registrujem novi nalog"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "Podesi..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prok_si:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Snimi lozinku"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "Mogućnosti servera"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri povezivanju"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "Koristi Vaše određeno ime hosta/port "
 
@@ -169,30 +166,31 @@ msgstr ""
 "na džaber mrežu."
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "Vaš džaber ID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Ime hosta:"
 
+#: ../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 "_Džaber ID:"
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Lozinka:"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "_Port:"
 
@@ -200,11 +198,6 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "_Korisničko ime:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -213,18 +206,16 @@ msgstr "<b>Ostalo</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>Lične informacije</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "Nalog"
 
@@ -233,23 +224,22 @@ msgid "Account Modification"
 msgstr "Izmena naloga"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 msgid "Administration operations"
 msgstr "Administratorske operacije"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatsko povezivanje kada se veza izgubi"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Po_veži se prilikom pokretanja Gajima"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "I_zmeni lozinku"
 
@@ -266,37 +256,35 @@ msgstr ""
 "omogućenom, TLS će biti isključen"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Odaberite _Ključ"
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Kliknite za izmenu lozinke Vašeg naloga"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Kliknite da zatražite autorizaciju svim kontaktima drugog naloga"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Veza"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "Izmeni lične informacije"
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:514 ../src/notify.py:545
-#: ../src/notify.py:557
+#: ../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"
 
@@ -304,17 +292,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2672
-#: ../src/roster_window.py:5157
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Opšte"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "Ime hosta"
 
@@ -337,7 +322,6 @@ msgstr ""
 "prekid veze zbog duge neaktivnosti"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -347,7 +331,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -357,7 +340,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -373,43 +355,45 @@ msgid "Information about you, as stored in the server"
 msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Nije odabran nijedan ključ"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2741
-#: ../src/roster_window.py:2747 ../src/roster_window.py:2752
+#: ../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 "Ništa"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "Lične Informacije"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "Port:"
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../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:42
+#: ../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 "
@@ -420,7 +404,7 @@ msgstr ""
 "prioritetomdobija događaje"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
 
@@ -429,12 +413,12 @@ msgid "Proxy:"
 msgstr "Proksi:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../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:46
+#: ../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 "
@@ -448,30 +432,25 @@ msgstr ""
 "najvišim prioritetom će dobijati obaveštenja o događajima"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "Snimi :lozinku (nesigurno)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Snimi dnevnik razgovora za sve kontakte"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "Šalji podatke o živosti"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Sinhroniziraj status naloga sa globalnim statusom"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../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 "Sinhronizuj kontakte"
@@ -481,21 +460,16 @@ msgid "Use _SSL (legacy)"
 msgstr "Koristi _SSL (zastarelo)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Koristi proksi za prenos datoteka"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "_Podesi prema statusu"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "_Džaber ID:"
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 msgid "_Name:"
 msgstr "_Ime:"
 
@@ -503,11 +477,21 @@ msgstr "_Ime:"
 msgid "<b>Proxy</b>"
 msgstr "<b>Proksi</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Podesi prema statusu"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "Nalozi"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Koristi autentikaciju"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -515,21 +499,18 @@ msgstr ""
 "Označite ovo da Vas Gajim pita pre nego što pošaljete lozinku preko "
 "nesigurne veze."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-mejl:"
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Omogući"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "Ime:"
 
@@ -538,7 +519,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -549,56 +529,98 @@ msgstr ""
 "Mogli biste uzeti u obzir i mogućnost izmene podešavanja firewall-a."
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:679
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "Džaber ID:"
 
 #: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "Prezime:"
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "_Spoji naloge"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5108
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Prei_menuj"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "Šalji podatke o živosti"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "Sinhroniziraj status naloga sa globalnim statusom"
+
+#: ../data/glade/accounts_window.glade.h:51
+#, fuzzy
+msgid "Use G_PG Agent"
 msgstr "Koristi GPG agenta"
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "Koristi Vaše određeno ime hosta/port "
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "Koristi svoj port:"
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "Izmeni lične informacije"
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "Omogući"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "Ime hosta:"
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "Podesi..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "_Port:"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "Upozori pre korišćenja nesigurne veze"
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+#, fuzzy
+msgid "_use HTTP__PROXY environment variable"
+msgstr "koristi HTTP_PROXY promenljivu okruženja"
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr "koristi HTTP_PROXY promenljivu okruženja"
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "_Nalog:"
@@ -784,7 +806,7 @@ msgid "All statuses"
 msgstr "Svi statusi"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Odsutan"
 
@@ -801,7 +823,7 @@ msgid "Have "
 msgstr "Imam "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Nevidljiv"
 
@@ -810,7 +832,7 @@ msgid "Launch a command"
 msgstr "Pokrenite komandu"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Nedostupan"
 
@@ -930,7 +952,7 @@ msgstr "Zadnji put izmenjeno:"
 msgid "New entry received"
 msgstr "Nov događaj primljen"
 
-#: ../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 "Primili ste novi unos:"
 
@@ -974,11 +996,19 @@ msgstr "Unesite novu lozinku:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Upišite Vašu novu statusnu poruku</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 "Aktivnost:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Raspoloženje:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Već postavljene poruke:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Snimi kao već postavljenu..."
 
@@ -1013,50 +1043,36 @@ msgstr "_Otvori vezu u internet pregledaču"
 msgid "_Start Chat"
 msgstr "_Započni razgovor"
 
-#. Execute Command
 #: ../data/glade/chat_control_popup_menu.glade.h:1
-#: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5694
-msgid "Execute Command..."
-msgstr "Izvrši naredbu..."
-
-#: ../data/glade/chat_control_popup_menu.glade.h:2
 msgid "Invite _Contacts"
 msgstr "Pozovi kontakte"
 
-#. Send Custom Status
-#: ../data/glade/chat_control_popup_menu.glade.h:3
-#: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5073 ../src/roster_window.py:5660
-msgid "Send Cus_tom Status"
-msgstr "Pošalji korisnički definisan status"
-
-#: ../data/glade/chat_control_popup_menu.glade.h:4
+#: ../data/glade/chat_control_popup_menu.glade.h:2
 #: ../data/glade/gc_occupants_menu.glade.h:3
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4
 msgid "Send _File"
 msgstr "Pošalji _datoteku"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:5
+#: ../data/glade/chat_control_popup_menu.glade.h:3
 msgid "Toggle End to End Encryption"
 msgstr "Uključi/isključi enkripciju s kraja na kraj"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:6
+#: ../data/glade/chat_control_popup_menu.glade.h:4
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uključi/isključi Open_PGP enkripciju"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:7
+#: ../data/glade/chat_control_popup_menu.glade.h:5
 #: ../data/glade/gc_occupants_menu.glade.h:4
 msgid "_Add to Roster"
 msgstr "_Dodaj na listu kontakata"
 
-#: ../data/glade/chat_control_popup_menu.glade.h:8
+#: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5804
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Istorijat"
 
@@ -1164,7 +1180,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Prikaži iskačuće obaveštenje kada se završi prenos datoteke"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Nastavi"
 
@@ -1200,7 +1216,7 @@ msgstr ""
 "Red kontakata\n"
 "Baner razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:752
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Podebljano"
 
@@ -1220,11 +1236,11 @@ msgstr "Personalizacija Gajim tema"
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../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 "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:753
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kurziv"
 
@@ -1272,7 +1288,7 @@ msgstr "Promeni _temu..."
 msgid "Configure _Room..."
 msgstr "Podesi _sobu..."
 
-#: ../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 "_Markiraj ovu so_bu"
 
@@ -1304,23 +1320,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../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 "_Blokiraj"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Član"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Vlasnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Pošalji privatnu poruku"
 
-#: ../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 "_Odblokiraj"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Glas"
 
@@ -1328,13 +1358,13 @@ msgstr "_Glas"
 msgid "Create new post"
 msgstr "Napravi novu objavu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Tema"
 
@@ -1353,7 +1383,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Dobrodošli u Gajimov menadžer dnevnika istorijata</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 "Obriši"
 
@@ -1406,7 +1437,7 @@ msgstr "Pretraga:"
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1698
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
@@ -1433,8 +1464,8 @@ msgstr "Nedavno:"
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
-#: ../src/disco.py:1620
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Pridruži se"
 
@@ -1463,7 +1494,7 @@ msgstr "Umanji prozor na auto povezivanje"
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1492,36 +1523,54 @@ msgid "<b>Settings</b>"
 msgstr "<b>Podešavanja</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
+#, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr ""
 "HTTP spoj\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje proksi profila"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "Ime:"
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Lozinka:"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "Vrsta:"
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "Proksi:"
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "Koristi autentikaciju"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "_Port:"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "_Host:"
+msgid "Use HTTP prox_y"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "Koristi autentikaciju"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+msgid "_BOSH URL:"
+msgstr ""
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "Vrsta:"
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Korisničko ime:"
 
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
@@ -1571,7 +1620,7 @@ msgstr "Prikaži profil kontakta (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 "_Pošalji"
 
@@ -1669,10 +1718,14 @@ msgstr ""
 "nevidljiv"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "Pitaj za statusnu poruku pri:"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1686,19 +1739,19 @@ msgstr ""
 "Uvek koristi predefinisane HFCE4 aplikacije\n"
 "Prilagođeno"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 msgid "Chat message:"
 msgstr "Poruka razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "Konfigurisanje boje i fonta interfejsa"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1712,31 +1765,31 @@ msgstr ""
 "Otkačena lista kontakata sa razgovorima grupisanom po nalozima\n"
 "Otkačena lista kontakata sa razgovorima grupisanom po tipu"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži aktivnosti kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne e-mejl detalje"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _pesme kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži _avatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženja kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1746,7 +1799,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1756,7 +1809,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -1764,11 +1817,11 @@ msgstr ""
 "Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
 "prozorom u donjem desnom uglu ekrana"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij svu dugmad u prozoru razgovora"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1776,7 +1829,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1784,14 +1837,14 @@ msgstr ""
 "Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
 "e-mejlova"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ako je označena, Gajim će automatski promeniti status u Odsutan kada računar "
 "nije u upotrebi."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
@@ -1799,7 +1852,7 @@ msgstr ""
 "Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
 "duže nije u upotrebi"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1807,7 +1860,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
@@ -1815,26 +1868,26 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati aktivnosti kontakata u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
 "kontakata"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati pesme kontakata u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
@@ -1845,7 +1898,7 @@ msgstr ""
 "polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
 "grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
 "Use with caution, because it blocks all messages from any contact that is "
@@ -1854,7 +1907,7 @@ msgstr ""
 "Ako je označena, Gajim će ignorisati sve dolazne događajeKoristite sa "
 "oprezom, blokiraće sve poruke koje dolaze od ljudi van Vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
@@ -1864,7 +1917,7 @@ msgstr ""
 "kada se koristi E2E enkripcija, druga strana mora da se složi sa čuvanjem "
 "dnevnika, u suprotnom se poruke neće pamtiti."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1872,7 +1925,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
 "GMail-amejlova"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1881,7 +1934,7 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
@@ -1889,7 +1942,7 @@ msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1897,43 +1950,50 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 msgid "Ma_ke message windows compact"
 msgstr "Načini prozor poruke kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "Pode_si..."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 msgid "Personal Events"
 msgstr "Lični događaji"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "Puštaj zvukove"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
@@ -1943,19 +2003,24 @@ msgstr ""
 "Obavesti me o tome\n"
 "Prikaži samo u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "Prikaži događaj u sistemskoj kaseti"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "Prijavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "Odjavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1963,139 +2028,145 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
 "je označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 msgid "Status _iconset:"
 msgstr "Skup statusnih ikona:"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
+#, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 "Auto statusna poruka pri odsutnosti. Ako je prazno, Gajim neće izmeniti "
 "trenutnu statusnu poruku"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
+#, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 "Auto statusna poruka pri nedostupnosti. Ako je prazno, Gajim neće izmeniti "
 "trenutnu statusnu poruku"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 msgid "Use _transports icons"
 msgstr "Koristi ikone za _transporte"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "Koristi sistemski podrazumevano"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 msgid "When new event is received:"
 msgstr "Kada se primi novi događaj:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 msgid "_Away after:"
 msgstr "Autom_atski odsutan posle:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 msgid "_Display chat state notifications:"
 msgstr "_Prikazana obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 msgid "_Emoticons:"
 msgstr "_Smajliji:"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "_Pregledač datoteka:"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "_Oboji pogrešno napisane reči"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "_Dolazna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "_E-mejl klijent:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 msgid "_Not available after:"
 msgstr "Automatski _nedostupan nakon:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "_Odlazna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "_Ponovo učitaj podrazumevane boje"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 msgid "_Send chat state notifications:"
 msgstr "Pošalji obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr "URL osvetljavanje:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr "Ponašanje prozora:"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 msgid "in _roster"
 msgstr "u _listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "minuta"
 
@@ -2143,7 +2214,7 @@ msgstr "Džaber ID"
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2566
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
@@ -2208,108 +2279,108 @@ msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Država:</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Odsek:</b>"
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>E-mejl:</b>"
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Dodatna adresa:</b>"
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Prezime:</b>"
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno ime</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Ime:</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Lična strana:</b>"
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Srednje ime:</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Ime:</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Nadimak:</b>"
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Broj telefona:</b>"
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Pozicija:</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Poštanski broj:</b>"
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Uloga:</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Pokrajina:</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Ulica:</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufiks:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "O"
 
@@ -2319,17 +2390,17 @@ msgstr "Kliknite da biste postavili Vaš avatar"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: GGGG-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "Lične informacije"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "Posao"
 
@@ -2347,8 +2418,8 @@ msgstr "Ukloni nalog i iz Gajima i sa servera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5145
-#: ../src/roster_window.py:5622 ../src/roster_window.py:5751
+#: ../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 "_Ukloni"
 
@@ -2368,10 +2439,16 @@ msgstr "Pridruži Open_PGP Ključ..."
 msgid "Edit _Groups..."
 msgstr "Izmeni _grupe..."
 
+#. Execute Command
+#: ../data/glade/roster_contact_context_menu.glade.h:5
+#: ../src/roster_window.py:5815
+msgid "Execute Command..."
+msgstr "Izvrši naredbu..."
+
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5063 ../src/roster_window.py:5575
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
@@ -2379,6 +2456,12 @@ msgstr "Pozo_vi u"
 msgid "Remo_ve"
 msgstr "_Ukloni"
 
+#. Send Custom Status
+#: ../data/glade/roster_contact_context_menu.glade.h:8
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
+msgid "Send Cus_tom Status"
+msgstr "Pošalji korisnički definisan status"
+
 #: ../data/glade/roster_contact_context_menu.glade.h:9
 msgid "Send Single _Message..."
 msgstr "Pošalji jednu _poruku..."
@@ -2400,12 +2483,6 @@ msgstr "Započni ra_zgovor"
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli mu/joj da vidi moj status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5136 ../src/roster_window.py:5612
-#: ../src/roster_window.py:5741
-msgid "_Block"
-msgstr "_Blokiraj"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
@@ -2427,16 +2504,34 @@ msgstr "_Preimenuj..."
 msgid "_Subscription"
 msgstr "_Pretplata"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5130 ../src/roster_window.py:5606
-#: ../src/roster_window.py:5738
-msgid "_Unblock"
-msgstr "_Odblokiraj"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "_Poništi ignrisanje"
 
+#: ../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 "gtk-close"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk-close"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "_Dodaj kontakt..."
@@ -2462,56 +2557,62 @@ msgid "Profile, A_vatar"
 msgstr "Profil, A_vatar"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "Prikaži kontakte koji nisu na vezi"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "Prikaži trans_porte"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
-#: ../data/glade/roster_window.glade.h:11
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 msgid "_Accounts"
 msgstr "_Nalozi"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1353
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "_ČPP"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "_Podešavanja"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "_Izlaz"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 msgid "_Send Single Message..."
 msgstr "Pošalji jednu _poruku..."
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "_Prikaz"
 
@@ -2528,11 +2629,11 @@ msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5763
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../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 "_Pretraga"
 
@@ -2618,10 +2719,6 @@ msgstr "Zahtev za pretplatom"
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
@@ -2646,10 +2743,6 @@ msgstr "Pošalji _jednu poruku"
 msgid "Show All Pending _Events"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "_Prikaži listu kontakata"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2667,49 +2760,54 @@ msgstr "<b>Autorizacija:</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>Klijent:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Pokrajina:</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Džaber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Prijava:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sistem:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "Komentari"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurisani avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "Informacije kontakta"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "Još"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 msgid "User avatar:"
 msgstr "Korisnički avatar:"
 
@@ -2721,6 +2819,11 @@ msgstr "<b>Džaber saobraćaj</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Unos</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "Omogući"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2749,13 +2852,13 @@ msgstr "Pridruži Open_PGP Ključ"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5595
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5721
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "_Preimenuj"
 
@@ -2779,29 +2882,25 @@ msgstr "Resurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "Izmeni nalog"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Poništi odobravanje"
 
-#: ../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 "Trenutno izvršavate komandu. Da li želite da je prekinete?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
-msgstr "Servis je izmenio identifikator sesije."
-
-#: ../src/adhoc_commands.py:317
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
 msgid "Service sent malformed data"
 msgstr "Servis je poslao loše podatke"
 
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
+msgstr "Servis je izmenio identifikator sesije."
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
@@ -2826,7 +2925,7 @@ msgstr "Ceo broj"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:772
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Boja"
 
@@ -2851,174 +2950,198 @@ msgstr "(ništa)"
 msgid "Hidden"
 msgstr "Skriven"
 
+#: ../src/atom_window.py:110
+#, fuzzy, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr "Primili ste novi unos:"
+
 #. 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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "Engleski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "Beloruski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bugarski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "Bretanski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Češki"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "Nemački"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "Britanski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Španski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "Baskijski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "Francuski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Hrvatski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italijanski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "Norveški (b)"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Holandski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Poljski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazilski portugalski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Ruski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "Srpski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovački"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Švedski"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:336
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Jezik za pravopis"
 
 #. we are not connected
-#: ../src/chat_control.py:359 ../src/chat_control.py:555
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:360 ../src/chat_control.py:556
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Vaša poruka ne može biti poslata ako niste povezani."
 
-#: ../src/chat_control.py:754
+#: ../src/chat_control.py:772
 #, fuzzy
 msgid "Underline"
 msgstr "Nedefinisan"
 
-#: ../src/chat_control.py:755
+#: ../src/chat_control.py:773
 #, fuzzy
 msgid "Strike"
 msgstr "Bolestan"
 
-#: ../src/chat_control.py:778
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:787
+#: ../src/chat_control.py:805
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informacije kontakta"
 
-#: ../src/chat_control.py:1217 ../src/chat_control.py:1620
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Stvarno pošalji datoteku?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1246 ../src/chat_control.py:2115
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:861
-#: ../src/dialogs.py:904 ../src/gajim.py:980 ../src/gajim.py:1640
-#: ../src/normal_control.py:483 ../src/roster_window.py:915
-#: ../src/roster_window.py:1541 ../src/roster_window.py:1543
-#: ../src/roster_window.py:1879 ../src/roster_window.py:3110
-#: ../src/roster_window.py:3134 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5441
+#: ../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 "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1378 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "Lista prenosa aktivnih, završenih i zaustavljenih datoteka"
+
+#: ../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 "Nepoznat izvođač"
 
-#: ../src/chat_control.py:1380 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: ../src/chat_control.py:1386 ../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"
@@ -3027,26 +3150,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> od <i>%(artist)s</i>\n"
 "iz <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1391
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s od %(artist)s\n"
-"iz %(source)s"
-
-#: ../src/chat_control.py:1515
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1600 ../src/dialogs.py:3912
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1601
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3054,50 +3168,50 @@ msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:1610
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:1637
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1651
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1653
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "i autentifikovani"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "i NEautentifikovani"
 
 #. 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:1667
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3106,26 +3220,26 @@ msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:1715
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Komanda nije podržana za zeroconf  nalog."
 
-#: ../src/chat_control.py:1726 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Komanda: %s"
 
-#: ../src/chat_control.py:1729 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Način korišćenja: /%s, prazni tekstualni prozor"
 
-#: ../src/chat_control.py:1732 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Način korišćenja: /%s, sakriva dugmad."
 
-#: ../src/chat_control.py:1735 ../src/groupchat_control.py:1688
+#: ../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 "
@@ -3134,63 +3248,63 @@ msgstr ""
 "Način korišćenja: /%(command)s <action>, šalje akciju trenutnom grupnom "
 "razgovoru. Koristititreće lice. (npr. /%(command)s je eksplodirao.)"
 
-#: ../src/chat_control.py:1740
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Način korišćenja: /%s, šalje pink kontaktu"
 
-#: ../src/chat_control.py:1743
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Način korišćenja: /%s, šalje poruku kontaktu"
 
-#: ../src/chat_control.py:1746 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Nema informacija ni pomoći za /%s"
 
-#: ../src/chat_control.py:1878
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:1885
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: ../src/chat_control.py:1888
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:1895
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Identitet drugog korisnika nije potvrđen. Kliknite na štit za više detalja."
 
-#: ../src/chat_control.py:1897
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:1926 ../src/chat_control.py:1939
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:1932
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Sledeća poruka je bila šifrovana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2303
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2304
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3198,15 +3312,15 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2453 ../src/common/connection_handlers.py:1847
-#: ../src/common/connection_handlers.py:1893
-#: ../src/common/connection_handlers.py:2081
-#: ../src/common/connection_handlers.py:2213 ../src/common/connection.py:1218
-#: ../src/gajim.py:174
+#: ../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 "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2454
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3215,168 +3329,180 @@ msgstr ""
 "Datoteka baze podataka (%s) se ne može čitati. Pokušajte da je popravite ili "
 "uklonite (sav istorijat poruka će biti izgubljen)."
 
-#: ../src/chat_control.py:2690
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../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 je datoteka, ali bi trebala biti fascikla"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 će se sada završiti"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s je fascikla, ali bi trebala biti datoteka"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 msgid "Change status information"
 msgstr "Izmeni statusne informacije"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 msgid "Change status"
 msgstr "Izmeni status"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr "Postavi tip prisutnosti i opis"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 msgid "Online"
 msgstr "Na vezi"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr "Duže odsutan"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 msgid "Do not disturb"
 msgstr "Ne smetaj"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr "Nije na vezi"
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 msgid "Presence description:"
 msgstr "Opis prisutnosti:"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr "Status se promenio."
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 msgid "Leave Groupchats"
 msgstr "Napusti grupne razgovore"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_jid)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 msgid "You have not joined a groupchat."
 msgstr "Ppridružili ste se grupnom razgovoru."
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr "Odaberite grupne razgovore koje želite da napustite"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
-#: ../src/roster_window.py:5033
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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 "Grupni razgovori"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sledeće grupne razgovore:"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 msgid "Forward unread messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su prosleđene."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Koristi DBus i demon obaveštenja za prikazivanje obaveštenja"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Vreme u minutama, nakom koga će se Vaš status promeiti u Odsutan."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Odsutan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "odsutnosti."
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Vreme u minutama, nakom koga će se Vaš status promeiti u Nije dostupan."
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Nije dostupan, kao posledica mirovanja više od $T min.)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 "$S će biti zamenjeno sa trenutnom statusnom porukom,$T sa vremenom "
 "nedostupnosti"
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:452
-#: ../src/common/optparser.py:217 ../src/common/optparser.py:435
-#: ../src/common/optparser.py:469 ../src/gajim.py:3128
+#: ../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 "podrazumevano"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Omogući lokalnu vezu/zeroconf poruke"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Jezik koji koristi pravopis"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3386,7 +3512,7 @@ msgstr ""
 "'ponekad' - ispisuj vreme svakih print_ichat_every_foo_minutes minuta.\n"
 "'nikad' - nikad ne ispisuj vreme."
 
-#: ../src/common/config.py:121
+#: ../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. "
@@ -3397,18 +3523,18 @@ msgstr ""
 "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje_vremena "
 "postavnjeno na 'ponekad'."
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Smatraj * / _ parove kao znakove za formatiranje."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ako je istinito, ne uklanjaj */_ . Tako će *abv* biti podebljano, ali "
 "iokruženo sa * *."
 
-#: ../src/common/config.py:128
+#: ../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/"
@@ -3419,7 +3545,7 @@ msgstr ""
 "ref/rst/restructuredtext.html (Ako želite da koristite ovo, instalirajte "
 "docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3427,7 +3553,7 @@ msgstr ""
 "Karakter za dodavanje posle nadimka kada se koristi dovršavanje nadimka "
 "(tasterom tab) u grupnom razgovoru"
 
-#: ../src/common/config.py:138
+#: ../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."
@@ -3435,7 +3561,7 @@ msgstr ""
 "Karakter koji želite dodati posle željenog nadimka ukoliko je željeni "
 "nadimak u grupnom razgovoru već upotrebljen"
 
-#: ../src/common/config.py:165
+#: ../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 "
@@ -3446,19 +3572,19 @@ msgstr ""
 "dokumentaciju za strftime, za punu dokumentaciju: http://docs.python.org/lib/"
 "module-time.html"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani pre nadimka u razgovoru"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Karakteri koji će biti prikazani posle nadimka u razgovoru"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Dodaj * i [n] u naslov liste kontakata?"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3466,11 +3592,11 @@ msgstr ""
 "Koliko linija prethodnog razgovora pamtiti kada se prozor/jezičak  za "
 "razgovor ponovo otvori."
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Koliko minuta da traju linije prethodnog razgovora."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3478,11 +3604,11 @@ msgstr ""
 "Pošalji poruku sa Ctrl+Enter, a sa Enter pravi novu liniju. (Podrazumevano "
 "ponašanje Miralabisovog ICQ klijenta)"
 
-#: ../src/common/config.py:177
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Koliko linija sačuvati sa Ctrl+KeyUP"
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3491,11 +3617,11 @@ msgstr ""
 "Ili Vaš specificirani URL sa %s u njemu gde je %s reč ili fraza ili 'VIKI-"
 "REČNIK' što znači korišćenje viki-rečnika."
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Ako je označeno, Gajim se može kontrolisati korišćenjem gajim-remote."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3506,14 +3632,14 @@ msgstr ""
 "računa (ako nemaju listen_to_network_manager postavljen na neistinito i "
 "sinhronizuj sa globalnim statusom) u zavisnosti od statusa mrežne konekcije."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 "Poslata obaveštenja o stanju razgovora. Može biti jedno od "
 "'svi','samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
@@ -3521,7 +3647,7 @@ msgstr ""
 "Prikazana obaveštenja o stanju razgovora u prozoru za razgovor. Može biti "
 "jedno od 'svi', 'samo_sastavljanje', 'onemogućeno'."
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3529,11 +3655,11 @@ msgstr ""
 "Ako se ne ispisuje vreme za svaku poruku (print_time==ponekad), ispisati ga "
 "svakih x minuta"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Pitaj pre zatvaranja prozora/jezička grupnog razgovora."
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3541,7 +3667,7 @@ msgstr ""
 "Uvek pitaj pre zatvaranja jezička/prozora kada je u pitanju ova lista "
 "odvojena blanko karakterima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3549,7 +3675,13 @@ msgstr ""
 "Nikad ne pitaj pre zatvaranja jezička/prozora grupnog razgovora kada je u "
 "pitanju ova listaodovojena blanko znacima džaber ID-ova grupnih razgovora."
 
-#: ../src/common/config.py:194
+#: ../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
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3557,35 +3689,27 @@ msgstr ""
 "Lista hostova odvojena zarezima, koju šaljemo, uz lokalne interefejse, za "
 "transfer datoteka, u slučaju prosleđivanja porta/NATovanja."
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard definiše KiB = 1024 bajtova, KB = 1000 bajtova"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "Obavesti me o svim događajima u ikoni sistemske kasete."
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Prikaži jezičak iako je samo jedan razgovor?"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Prikaši granicu sveske u prozorima razgovora?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Prikaši dugme za zatvaranje u jezičku?"
 
-#: ../src/common/config.py:207
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-"Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
-"želite da čuvate poruke u dnevniku?"
-
-#: ../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 "
@@ -3596,18 +3720,18 @@ msgstr ""
 "prioritet, odvojeni zarezima. Validne grupe su 1, 2, 5, 14, 15, 16, 17 i 18. "
 "Višlji brojevi su sugurniji, ali tada treba više vremena za početak sesije."
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 msgid "Preview new messages in notification popup?"
 msgstr "Pregledaj nove poruke u iskačućim obaveštenjima?"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr ""
 "Lista reči odvojena blanko karakterima koje će biti obojene u grupnim "
 "razgovorima"
 
-#: ../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."
@@ -3615,14 +3739,14 @@ msgstr ""
 "Ako je istinito, Gajim se završava kada se pritisne X dugme. Ovo podešavanje "
 "se koristi samo ako je ikona sistemske kasete u upotrebi."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr ""
 "Ako je istinito, Gajim proverava da li je podrazumevani džaber klijent na "
 "svakom startovanju."
 
-#: ../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."
@@ -3630,7 +3754,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ikonu na svakom jezičku koji sadrži "
 "nepročitane poruke. U zavisnosti od teme, ikona može biti i animirana."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3638,12 +3762,12 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: ../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 ""
 "Definišite poziciju avatara u listi kontakata. Može biti levo ili desno"
 
-#: ../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."
@@ -3651,7 +3775,7 @@ msgstr ""
 "Ako je istinito, Gajim će poslati upit za avatar za svaki kontakt koji "
 "prošlog puta nije  imao avatar ili je onaj u memoriji prestar"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3659,7 +3783,7 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: ../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 "
@@ -3673,30 +3797,30 @@ msgstr ""
 "sve statusne poruke. Ako je \"in_and_out\". Gajim će prikazivati samo poruke "
 "tipa taj i taj je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakta kada tek dođu na vezu."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakta kada tek odu sa veze."
 
-#: ../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 ""
 "Ako je istinito, vraćene poruke iz istorijata će biti manjeg fonta od "
 "podrazumevanog."
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: ../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 "
@@ -3706,7 +3830,7 @@ msgstr ""
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3717,7 +3841,7 @@ msgstr ""
 "u grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3736,31 +3860,31 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ako nije istinito, nećete više videti avatar u prozoru razgovora."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ako je istinito, pritisak na taster 'esc' zatvara jezičak/prozor."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Sakriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Sakriva baner u prozoru razgovora dve osobe"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
 
-#: ../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."
@@ -3768,15 +3892,15 @@ msgstr ""
 "U razgovoru, prikaži nadimak na početku novog reda samo kada se ne radi o "
 "istoj osobi koja je pričala i u prošloj poruci."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko skrolovanje u prozoru razgovora"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3784,11 +3908,11 @@ msgstr ""
 "Lista boja odvojena sa \":\" koje će biti korišćene za bojenje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab ide na sledeći jezičak kada nema nepročitanih jezičaka"
 
-#: ../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."
@@ -3796,7 +3920,7 @@ msgstr ""
 "Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazan niz znači "
 "da nikada ne prikazujemo upit."
 
-#: ../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 "
@@ -3806,7 +3930,7 @@ msgstr ""
 "nalog u prozoru za izmenu podešavanja naloga. BUDITE OPREZNI, kada ste "
 "povezani sa negativnim prioritetom NEĆETE primati nikakve poruke od servera."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3814,7 +3938,16 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
+"uskladišti lozinke naloga."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3822,7 +3955,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: ../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"
@@ -3830,7 +3963,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretira sve dolazne "
 "poruke kao poruke postavljenog tipa"
 
-#: ../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."
@@ -3838,7 +3971,7 @@ msgstr ""
 "Ako je istinito, Gajim će skrolovati i označiti kontakt koji Vam je "
 "poslednji poslao poruku, ako prozor razgovora nije otvoren."
 
-#: ../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."
@@ -3846,11 +3979,11 @@ msgstr ""
 "Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u sliku "
 "koristeći dvips u ibaciti je u prozor razgovora."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Vreme neaktivnosti posle koga se prozor za izmenu statusa zatvara."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3858,7 +3991,7 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3866,27 +3999,33 @@ msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Odaberite interval između dve provere da se ništa ne dešava na računaru."
 
-#: ../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 "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 #, fuzzy
 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 ""
 "Ispravne uri šeme. Samo šeme sa ove liste će biti prihvaćene kao \"stvarne\" "
 "uri."
 
-#: ../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."
@@ -3894,7 +4033,7 @@ msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: ../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"
@@ -3903,26 +4042,26 @@ msgstr ""
 "dnd, invisible. PAŽNjA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: ../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 ""
 "Ako je onemogućeno, ne potpisuj prisustvo sa GPG ključem, čak iako je GPG "
 "konfigurisan."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Da li će Gajim automatski startovati šifrovanu sesiju ako je moguće?"
 
-#: ../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"
@@ -3930,34 +4069,43 @@ msgstr ""
 "Uređena lista (odvojena zarezima) tipova konekcije za probu. Može sadržati "
 "tls, ssl ili plain"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Prikaži prozor upozorenja pre korišćenja standardne SSL biblioteke."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
-#: ../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
+#, fuzzy
 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 ""
 "Koliko sekundi čekati na odgovor o pkaetima o živosti pre nego što pokušamo "
 "ponovno uspostavljanje veze."
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: ../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."
@@ -3965,19 +4113,27 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti Vašu IP adresu u proksi koji je "
 "difinisan u file_transfer_proxies podešavanjima za prenos."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: ../src/common/config.py:393
+#: ../src/common/config.py:340
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
+"želite da čuvate poruke u dnevniku?"
+
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:394
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -3985,101 +4141,101 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:395 ../src/common/config.py:398
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:404
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'da', 'ne', ili 'oboje'"
 
-#: ../src/common/config.py:406 ../src/common/config.py:408
-#: ../src/common/config.py:409 ../src/common/config.py:412
-#: ../src/common/config.py:413
+#: ../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 "'da', 'ne' ili ''"
 
-#: ../src/common/config.py:419 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:421 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:423 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:423
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:424
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:431 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:434 ../src/common/config.py:435
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4088,68 +4244,99 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:231
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:459 ../src/common/optparser.py:217
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Loš host"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Nevalidna lokalna adresa? :-O"
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1845
-#: ../src/common/connection_handlers.py:1891
-#: ../src/common/connection_handlers.py:2079
-#: ../src/common/connection_handlers.py:2211 ../src/common/connection.py:1216
-#: ../src/gajim.py:396
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr "Registruj se na %s"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "Veza prekinuta"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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 "Greška pri upisu na disk"
 
-#: ../src/common/connection_handlers.py:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1848
-#: ../src/common/connection_handlers.py:1894
-#: ../src/common/connection_handlers.py:2082
-#: ../src/common/connection_handlers.py:2214 ../src/common/connection.py:1219
-#: ../src/gajim.py:175
+#: ../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 "Neispravan džaber ID"
+
+#: ../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: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."
@@ -4159,78 +4346,77 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
 "istorijat poruka će biti izgubljen)."
 
-#: ../src/common/connection_handlers.py:1966
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljen nadimak: %s "
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2041
-#: ../src/common/connection_handlers.py:2044
-#: ../src/common/connection_handlers.py:2047
-#: ../src/common/connection_handlers.py:2050
-#: ../src/common/connection_handlers.py:2054 ../src/gajim.py:560
+#: ../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 "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2042
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2045
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/common/connection_handlers.py:2048
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: ../src/common/connection_handlers.py:2051
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2055
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2097
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: ../src/common/connection_handlers.py:2104
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: ../src/common/connection_handlers.py:2131
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2152
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada ste pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2154
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada Vam je ukinuta pretplata od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2337
+#: ../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 "
@@ -4241,213 +4427,218 @@ msgstr ""
 "ga uklonili"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2362
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Lozinka za OpenPGP nije uneta"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2364
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../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 "Povezaćete se na %s bez OpenPGP ključa."
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr "Nisam uspeo da uzmem sertifikat izdavača"
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr "Nisam uspeo da uzmem CRL sertifikata"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr "Nisam uspeo da dešifrujem potpis sertifikata"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr "Nisam uspeo da dešifrujem CRL sertifikata"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 msgid "Unable to decode issuer public key"
 msgstr "Nisam uspeo da dekodiram javni ključ izdavača"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr "Greška u potpisu sertifikata"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr "Greška u CRL sertifikata"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr "Sertifikat još nije validan"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr "Sertifikat je istekao"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr "CRL nije još validan"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr "CRL je istekao"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr "Greška u formatu sertifakovog polja od kada je validan"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr "Greška u formatu sertifakovog polja do kada je validan"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja poslednjeg ažuriranja"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr "Greška u formatu CRL-ovogpolja sledećeg ažuriranja"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr "Nemam više memorije"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr "Samopotpisani sertifikat"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr "Samopotpisani sertifikat u lancu sertifikata"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr "U nemogućnosti da uzmem sertifikat lokalnog izdavača"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr "U nemogućnosti da verifikujem prvi sertifikat"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr "Lanac sertifikata predugačak"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr "Sertifikat povučen"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 msgid "Invalid CA certificate"
 msgstr "Neispravan sertifikat sertifikacionog tela (CA)"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr "Prekoračena dužina putanje"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr "Nepodržana svrha sertifikata"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr "Sertifikatu se ne veruje"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr "Sertifikat odbačen"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr "Pogrešna tema izdavača sertifikata"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr "Identifikator ključa autorizatora i teme se ne poklapaju"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr "Serijski broj autorizatora i izdavača se ne poklapaju"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Server %(name)s je loše odgovorio na zahtev registracije:: %(error)s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Transport %(name)s je loše odgovorio na zahtev registracije: %(error)s"
 
-#: ../src/common/connection.py:522
-msgid "Connection to proxy failed"
-msgstr "Veza sa proksijem prekinuta"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1351
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1057
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "Sačuvano u: %s"
+
+#: ../src/common/connection.py:658
+msgid "Connection to proxy failed"
+msgstr "Veza sa proksijem prekinuta"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Izgubljena veza sa nalogom %s. Pokušajte ponovo da se konektujete."
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentičnost sertifikata %s može biti neispravna."
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4456,7 +4647,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4465,24 +4656,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentikacija sa \"%s\" neuspešna"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Molimo Vas da proverite Vaše korisničko ime i lozinku od grešaka."
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:801
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4491,25 +4682,30 @@ msgstr ""
 "Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od Vaših "
 "resursa na vezi. Deaktivirajte je tamo i pokušajte ponovo."
 
-#: ../src/common/connection.py:1095
-#: ../src/common/zeroconf/connection_zeroconf.py:388
+#: ../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 "Nije moguće poslati praznu datoteku"
+
+#: ../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 "Niti je udaljeno prisustvo potpisano, niti je ključ dodeljen."
 
-#: ../src/common/connection.py:1097
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../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 "Ključ kontakta (%s) ne poklapa se sa ključem pridruženim u Gajimu."
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1106
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:467
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4518,20 +4714,30 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1384
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Pozovi kontakte"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
-#: ../src/gajim.py:980
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Posmatrači"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:806 ../src/roster_window.py:818
-#: ../src/roster_window.py:1470 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1676
+#: ../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 "Prenosi"
 
@@ -4540,11 +4746,11 @@ msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Na ovom računaru nedostaju python vezivanja za D-Bus"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus mogućnosti Gajima se ne mogu koristiti"
 
@@ -4574,356 +4780,356 @@ msgstr ""
 "Linija sesije nije dostupna.\n"
 "Pročitajte http:/trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "dvanaest"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "jedan"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "dva"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "četiri"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "pet"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "šest"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sedam"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "osam"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "devet"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "deset"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "jedanaest"
 
+#. 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 "dvanaest"
-
-#. 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 sati"
+msgid "%(0)s o'clock"
+msgstr "%(0)s sati"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "$0 i pet"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "%(0)s i pet"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "$0 i deset"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "%(0)s i deset"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "$0 i petnaest"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "%(0)s i petnaest"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "$0 i dvadeset"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "%(0)s i dvadeset"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "$0 i dvadeset i pet"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "%(0)s i dvadeset i pet"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "$0 i trideset minuta"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "%(0)s i trideset minuta"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "dvadeset i pet do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "dvadeset i pet do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "dvadeset do $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "dvadeset do %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "petnaest minuta do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "petnaest minuta do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "deset do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "deset do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "pet do $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "pet do %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1 sati"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s sati"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noć"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Rano jutro"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Jutro"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Skoro podne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Podne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Poslepodne"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Veče"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Kasno veče"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Početak nedelje"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Sredina nedelje"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Kraj nedelje"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "piše poruku..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4931,22 +5137,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4954,665 +5160,675 @@ msgstr[0] "%d događaj na čekanju"
 msgstr[1] "%d događaja na čekanju"
 msgstr[2] "%d događaj na čekanju"
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s nije ispravan nivo logovanja"
+
 #. 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 "greška: ne mogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:226 ../src/common/optparser.py:227
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:343
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim nalog %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "naloga %s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Uplašen"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Oduševljen"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Ljut"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Iznerviran"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Anksiozan"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Napaljen"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Posramljen"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Smoren"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Hrabar"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Miran"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Oprezan"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Smrznut"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Pouzdan"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Zbunjen"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Zadubljen u misli"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Na kraju živaca"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Lud"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Kreativan"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Zainteresovan"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Potišten"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Depresivan"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Razočaran"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Zgađen"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Skrhan"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Ometen"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Postiđen"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Zavidljiv"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Uzbuđen"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Za flertovanje"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustriran"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "U patnji"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Mrgudan"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Kriv"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Srećan"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "U nadanju"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Naložen"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Skroman"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Ponižen"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Gladan"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Povređen"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Impresioniran"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Očaran"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Zaljubljen"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Ozlojeđen"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Zainteresovan"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Otrovan"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Nepobediv"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Ljubomoran"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Usamljen"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Izgubljen"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Srećan"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Zloban"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Raspoložen"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nervozan"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Neutralan"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Uvređen"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Pobesneo"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Igrao bi se"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Ponosan"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Opušten"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Olakšan"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Samilostan"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Neumoran"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Tužan"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarkastičan"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Zadovoljan"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Ozbiljan"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Šokiran"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Stidljiv"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Bolestan"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Pospan"
 
-#: ../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 "Pod stresom"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Jak"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Iznenađen"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Zahvalan"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Žedan"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Umoran"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Nedefinisan"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Slab"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Zabrinut"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 msgid "Doing Chores"
 msgstr "Obavlja rutinu"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Kupuje namirnice"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Čisti"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Kuva"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Obavlja održavanje"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Pere sudove"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Pere veš"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Baštovani"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Na zadatku"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Šeta psa"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Pije"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Pije pivo"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Pije kafu"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Pije čaj"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Užina"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Doručkuje"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Ruča"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Večera"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Vežba"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Vozi biciklu"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Pleše"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 msgid "Hiking"
 msgstr "Šeta"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Džogira"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Bavi se sportom"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Trči"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Skija"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Pliva"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Vežba"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr "Češlja se"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "U banji"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Pere zube"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Šiša se"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Brije se"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Kupa se"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Tušira se"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "Sastanči"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Slobodan dan"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Bleji"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Krije se"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "Na odmoru"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Moli se"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Zakazani odmor"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Razmišlja"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Odmara se"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Peca"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Igra igrice"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Izlazi napolje"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Na provodu"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Čita"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Uvežbava"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "U šopingu"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Puši"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Druži se"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Sunča se"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Gleda TV"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Gleda film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Priča"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "U stvarnom životu"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Telefonira"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "Na video telefonu"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Putuje"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Muva se"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Vozi"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "U kolima"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "U autobusu"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "U avionu"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "U vozu"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "Na putu"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Šeta"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Programira"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "Na sastanku"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Uči"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Piše"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Ne mogu da se povežem na port %s."
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5620,14 +5836,14 @@ msgstr ""
 "Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 "[Ovo je deo šifrovane sesije. Ukoliko vidite ovo, nešto je pošlo naopako.]"
 
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
@@ -5636,17 +5852,17 @@ msgstr ""
 "Host %s koji ste postavili kao ft_add_host_to_send napredno podešavanje nije "
 "ispravan. pa je ignorisan."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Ako želite nastaviti sa slanjem i primanjem poruka, morate se isključiti i "
 "ponovo doći na vezu."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi greška"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5655,31 +5871,31 @@ msgstr ""
 "%s\n"
 "Poruke lokalne mreže možda neće raditi kako treba."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Proverite da li je Avahi ili Bonjour instaliran."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Nije moguće pokrenuti lokalni servis"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Ne mogu se povezati na port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Molimo proverite da li je avahi-demon pokrenut."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Nije moguće promeniti status računa \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:380
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5687,65 +5903,49 @@ msgstr ""
 "Niste spojeni ili ste nevidljivi za druge. Vaša poruka ne može biti poslata."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:398
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Ova poruka je šifrovana]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:479
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Vaša poruka nije mogla biti poslata."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:486
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakt nije na vezi. Vašu poruku nije moguće poslati."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:583
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Nije moguće ostvariti vezu sa hostom: Vreme za slanje podataka je isteklo."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Onemogućeno"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "Aktivno"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "događaj"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
-
-#: ../src/config.py:455
-msgid "Custom"
-msgstr "Korisnički"
-
-#: ../src/config.py:650 ../src/dialogs.py:1200
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5754,252 +5954,211 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "Primljena Prva Poruka"
-
-#: ../src/config.py:1054
-msgid "Next Message Received Focused"
-msgstr "Sledeća Primljena Poruka Fokusirana"
-
-#: ../src/config.py:1056
-msgid "Next Message Received Unfocused"
-msgstr "Sledeća Primljena Poruka Nefokusirana"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "Kontakt Na Vezi"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "Kontakt Otišao Sa Veze"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "Poruka Poslata"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "Bojenje Poruka Sa Grupnog Razgovora"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "Primljena Poruka Sa Grupnog Razgovora"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "Primljen Gmail e-mejl"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1824 ../src/dialogs.py:1888
-#: ../src/disco.py:770 ../src/disco.py:1564 ../src/disco.py:1811
-#: ../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 "Ime"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ako želite da se sve promene trenutno primene, morate da se ponovo povežete."
 
-#: ../src/config.py:1531 ../src/config.py:1630
+#: ../src/config.py:1521 ../src/config.py:1643
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Prozori svih razgovora i grupnih razgovora će biti zatvoreni. Želite li da "
 "nastavite?"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Da biste promenili ime naloga, morate prvo pročitati sve događaje na čekanju."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ovo ime već koristi jedan od Vaših naloga. Molimo Vas, odaberite drugo ime."
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "Neispravan džaber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Došlo je do problema u uzimanju Vaših OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2096 ../src/dialogs.py:1676 ../src/dialogs.py:1812
-#: ../src/dialogs.py:1991 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "Niste povezani na server"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez veze sa serverom, nije moguća izmena ličnih informacija."
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Vaš server ne može da sačuva Vaše lične informacije."
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Molimo Vas, preimenujte ili uklonite pre omogućavanja lokalnih poruka."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:777 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "DžID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6007,11 +6166,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6019,11 +6178,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6031,11 +6190,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6043,14 +6202,15 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "Može biti jedno od sledećeg:\n"
 "1. korisnik@domen/resurs (poklapa se samo sa tim resursom).\n"
@@ -6059,84 +6219,89 @@ msgstr ""
 "4. domen (samo se domen poklapa, kao i bilo koji korisnik@domen,\n"
 "domen/resurs, ili adresa koja sadrži poddomen."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1429 ../src/roster_window.py:1942
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1916
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1943
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Molimo obavezno ispunite polja servera i sobe ili uklonite ovaj marker."
 
-#: ../src/config.py:3072
-msgid "Invalid username"
-msgstr "Neispravno korisničko ime"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Nedozvoljen nadimak: %s "
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "Dupliraj Džaber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Neispravan server"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "Ovaj nalog je već konfigurisan u Gajimu."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Neispravan unos"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6146,24 +6311,32 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3137
-msgid "Invalid server"
-msgstr "Neispravan server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Neispravno korisničko ime"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3189 ../src/gajim.py:2007
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3190 ../src/gajim.py:2008
+#: ../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 "Sertifikat je već u datoteci %s, pa nije ponovo dodat."
 
-#: ../src/config.py:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6178,7 +6351,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3264 ../src/gajim.py:2031
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6189,23 +6362,63 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "Vaš novi nalog je uspešno napravljen"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/conversation_textview.py:562
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "Aktivno"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "događaj"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "Primljena Prva Poruka"
+
+#: ../src/config.py:3658
+msgid "Next Message Received Focused"
+msgstr "Sledeća Primljena Poruka Fokusirana"
+
+#: ../src/config.py:3660
+msgid "Next Message Received Unfocused"
+msgstr "Sledeća Primljena Poruka Nefokusirana"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "Kontakt Na Vezi"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "Kontakt Otišao Sa Veze"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "Poruka Poslata"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "Bojenje Poruka Sa Grupnog Razgovora"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "Primljena Poruka Sa Grupnog Razgovora"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "Primljen Gmail e-mejl"
+
+#: ../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"
@@ -6215,7 +6428,7 @@ msgstr ""
 "stigla na drugi kraj. Ako ova ikona ostane ovako \n"
 "dugo vremena, verovatno je da se poruka izgubila."
 
-#: ../src/conversation_textview.py:581
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6223,74 +6436,74 @@ msgstr ""
 "Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put\n"
 "obratili pažnju na ovaj grupni razgovor"
 
-#: ../src/conversation_textview.py:692
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "_Izlaz"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:704
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:709
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:726
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL-u Rečnika nedostaje \"%s\" i nije Viki rečnik"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
-#: ../src/conversation_textview.py:1015 ../src/conversation_textview.py:1033
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
-
-#: ../src/conversation_textview.py:1290
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Juče"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1294
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "Pre %i dana"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1328
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Džaber ID već u listi kontakata"
 
-#: ../src/dataforms_widget.py:541
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "Džaber ID koji ste uneli je već na listi. Odaberite neki drugi."
 
 #. Default jid
-#: ../src/dataforms_widget.py:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6305,27 +6518,27 @@ msgstr "Ime kontakta: <i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Džaber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "U grupi"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "ID Ključa"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Ime kontakta"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Postavi raspoloženje"
 
-#: ../src/dialogs.py:549
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Statusna poruka"
@@ -6334,114 +6547,114 @@ msgstr "%s Statusna poruka"
 msgid "Status Message"
 msgstr "Statusna poruka"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Prepiši statusnu poruku?"
 
-#: ../src/dialogs.py:664
+#: ../src/dialogs.py:751
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "Ovo ime se već koristi. Da li želite da prepišete ovu statusnu poruku?"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Snimi kao već postavljenu statusnu poruku"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Molimo unesite ime za ovu statusnu poruku"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM adresa:"
 
-#: ../src/dialogs.py:681
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG Broj:"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ Broj:"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN adresa:"
 
-#: ../src/dialogs.py:684
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! adresa:"
 
-#: ../src/dialogs.py:720
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati na nalog %s"
 
-#: ../src/dialogs.py:722
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molimo Vas ispunite podatke za kontakt koga želite dodati"
 
-#: ../src/dialogs.py:879 ../src/dialogs.py:885 ../src/dialogs.py:890
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:886
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:891
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:905
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:906
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:942
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1000
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "GTK+ džaber klijent"
 
-#: ../src/dialogs.py:1001
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1002
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1012
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1014
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1020
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1026
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr ""
 "Poslednje, ali ne i najmanje važno, želeli bismo zahvaliti svim "
 "održavateljima paketa"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1039
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6454,88 +6667,88 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1605
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Nadimak sadrži nedozvoljene karaktere."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Zahtev pretplate na račun %(account)s od %(jid)s"
 
-#: ../src/dialogs.py:1608
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:1669 ../src/gajim.py:2631
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:1677
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Ne možete se priključiti grupnom razgovoru ako niste povezani."
 
-#: ../src/dialogs.py:1696
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:1767
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:1768 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-msgid "The nickname has not allowed characters."
-msgstr "Nadimak sadrži nedozvoljene karaktere."
-
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:1773 ../src/dialogs.py:1779
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:1813
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:1827
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:1861
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Ne možete se sinhronizovati sa nalogom ako niste povezani."
 
-#: ../src/dialogs.py:1885
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:1943
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:1946
+#: ../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:"
@@ -6544,275 +6757,300 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2345 ../src/dialogs.py:2488
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:1971 ../src/dialogs.py:2346 ../src/dialogs.py:2489
-#: ../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 "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:1983
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:1983
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2011
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2016
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2056 ../src/notify.py:245 ../src/notify.py:472
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: ../src/dialogs.py:2058 ../src/notify.py:253 ../src/notify.py:474
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #. chat message
-#: ../src/dialogs.py:2060 ../src/notify.py:276 ../src/notify.py:476
-#: ../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 "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2060 ../src/notify.py:257 ../src/notify.py:476
-#: ../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 "Nova Samostalna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2061 ../src/notify.py:264 ../src/notify.py:477
-#: ../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 "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2061 ../src/gajim.py:1594 ../src/notify.py:485
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2063 ../src/gajim.py:1660 ../src/notify.py:479
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2065 ../src/gajim.py:1560 ../src/gajim.py:1627
-#: ../src/notify.py:481 ../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 "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1702 ../src/gajim.py:1724
-#: ../src/gajim.py:1741 ../src/notify.py:483 ../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 "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2068 ../src/gajim.py:1705 ../src/notify.py:483
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2070 ../src/gajim.py:1450 ../src/notify.py:487
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: ../src/dialogs.py:2072 ../src/notify.py:237 ../src/notify.py:489
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2268 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2271 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2294 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2317 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Forma %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2389 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2390 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2434
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2436
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML Konzola"
 
-#: ../src/dialogs.py:2560
+#. 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 "Želio bih da Vas dodam na listu mojih kontakata."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Raspoložen"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Džaber ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupa"
+
+#. 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 "Želeo bih da te dodam na moju listu kontakata."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2564
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:2620
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Redosled: %(order)s, akcija: %(action)s, tip: %(type)s, vrednost: %(value)s"
 
-#: ../src/dialogs.py:2625
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:2667
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:2850
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:2922
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:2923
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:2955
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Vas je pozvao na grupni razgovor u sobu %(room_jid)s"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:2970
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:3025
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:3035 ../src/dialogs.py:3086
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3040
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3073
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:3091
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3156
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3158
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
 #. # means number
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3235
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Uslov"
 
-#: ../src/dialogs.py:3353
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6823,19 +7061,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../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 "
@@ -6845,19 +7083,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../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 "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../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> "
@@ -6871,23 +7109,23 @@ msgstr ""
 "da li i on ima istu kratku Autentikacionu nisku kao vi.\n"
 "Kratka Autentikaciona Niska ove sesije: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Da li ste razgovarali sa kontaktom i potvrdili KAN?"
 
-#: ../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 ""
 "Ključ kontakta (%s) <b>ne poklapa se</b> sa ključem pridruženim u Gajimu."
 
-#: ../src/dialogs.py:3913
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
 "poruke."
 
-#: ../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."
@@ -6896,7 +7134,7 @@ msgstr ""
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../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."
@@ -6904,33 +7142,33 @@ msgstr ""
 "GPG ključ je dodeljen ovom kontaktu i Vi verujete ovom ključu tako da će "
 "poruke biti šifrovane."
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:657
+#: ../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."
@@ -6938,218 +7176,242 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:661 ../src/disco.py:957
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Ovaj tip usluge ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: ../src/disco.py:756
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:796
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:958
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1574
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1582
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1590
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1820
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Marker je već postavljen"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Grupni razgovor \"%s\" je već markiran."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Marker uspešno dodat"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
+"kontakata."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:1828
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:1885
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:1891
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:1897
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
-msgstr "PyOpenSSL"
+#: ../src/features_window.py:46
+#, fuzzy
+msgid "SSL certificat validation"
+msgstr "Greška SSL sertifikata"
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "Biblioteka koja se koristi da proveri sertifikate servera i osigura sigurnu "
 "vezu."
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Zahteva python-pyopenssl."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "Razgovor bez servera sa autodetekcijom klijenata u lokalnoj mreži."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Zahteva python-avahi."
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Zahteva pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr "gajim-remote"
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "Komanda: %s"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Skripta za kontrolu Gajima iz komandne linije."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Zahteva python-dbus."
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 "Mogućnost nije dostupna pod Vindouz sistemom."
 
-#: ../src/features_window.py:63
-msgid "OpenGPG"
-msgstr "OpenPGP"
+#: ../src/features_window.py:58
+#, fuzzy
+msgid "OpenGPG message encryption"
+msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
 msgstr "Šifrujem poruke razgovora sa gpg ključevima."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Zahteva gpg i python-GnuPGInterface."
 
-#: ../src/features_window.py:67
-msgid "network-manager"
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Network-manager"
 msgstr "network-manager"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Autodetekcija statusa mreže."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Zahteva gnome-network-manager i python-dbus."
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Menadžment sesija"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim sesija je sačuvana na prekidu veze i učitana po logovanju."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Zahteva python-gnome2."
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr "gnome-keyring"
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "Lozinka za ulazak u sobu"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lozinke se mogu sačuvati i pouzdanije od običnog teksta."
 
-#: ../src/features_window.py:77
-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 "Zahteva gnome-keyring and python-gnome2-desktop."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Daje mogućnost konekcije na servere koji koriste SRV zapise."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Zahteva dnsutils."
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Zahteva nslookup da biste koristili SRV zapise."
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Provera pravopisa"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Provera pravopisa sastavljenih poruka."
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
-msgstr ""
-"Zahteva python-gnome2-extras ili kompajliranje gtkspell modula iz Gajim "
-"izvornog koda."
+#: ../src/features_window.py:80
+#, fuzzy
+msgid "Requires libgtkspell."
+msgstr "Zahteva python-sexy."
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr "Notification-daemon"
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "Obaveštenja"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr "Pasivna iskačuća obaveštenja o novim događajima."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -7157,48 +7419,54 @@ msgstr ""
 "Zahteva python-notify ili, umesto toga python-dbus u sprezi sa notification-"
 "daemon."
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Ikona sistemske kasete"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Ikona u sistemskoj kaseti odražava trenutno stanje."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Zahteva python-gnome2-extras ili kompajliranje trayicon modula iz Gajim "
 "izvornog koda."
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Zahteva PyGTK >= 2.10."
 
-#: ../src/features_window.py:95
-msgid "Idle"
-msgstr "U stanju mirovanja"
+#: ../src/features_window.py:90
+#, fuzzy
+msgid "Automatic status"
+msgstr "_Podesi prema statusu"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 "Daje mogućnost merenja vremena kada se ništa ne dešava, da se odredi auto "
 "status."
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
-msgstr "Zahteva kompajliranje idle modula iz Gajim izvornog koda."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
+msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+#, fuzzy
+msgid "Requires python2.5."
+msgstr "Zahteva python-gnome2."
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Pretvara LaTeX izraze između $$ $$."
 
-#: ../src/features_window.py:101
+#: ../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."
@@ -7206,7 +7474,7 @@ msgstr ""
 "Zahteva texlive-latex-base, i dvipng. Morate podesiti'use_latex' na True u "
 "editoru naprednih podešavanja."
 
-#: ../src/features_window.py:102
+#: ../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."
@@ -7214,23 +7482,25 @@ msgstr ""
 "Zahteva texlive-latex-base i dvipng (sve iz MikTeX-a). Morate "
 "podesiti'use_latex' na True u editoru naprednih podešavanja."
 
-#: ../src/features_window.py:103
-msgid "End to End Encryption"
+#: ../src/features_window.py:98
+#, fuzzy
+msgid "End to End message encryption"
 msgstr "Enkripcija s kraja na kraj"
 
-#: ../src/features_window.py:104
-msgid "Encrypting chatmessages."
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Encrypting chat messages."
 msgstr "Šifrujem poruke razgovora."
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Zahteva python-crypto."
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST generator"
 
-#: ../src/features_window.py:108
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7238,24 +7508,24 @@ msgstr ""
 "Generiše XHTML izlaz od RST koda (pogledati http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 
-#: ../src/features_window.py:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Zahteva python-docutils."
 
-#: ../src/features_window.py:111
-msgid "libsexy"
-msgstr "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
+msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Daje mogućnost da imate linkove na koje se može kliknuti u razgovorima."
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Zahteva python-sexy."
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Mogućnost"
 
@@ -7284,7 +7554,7 @@ msgstr "Veličina: %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Vi"
 
@@ -7294,7 +7564,7 @@ msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Primaoc: "
 
@@ -7326,26 +7596,27 @@ msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Prenos datoteke je zaustavljen od kontakta sa druge strane"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Odaberite datoteku za slanje..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Opis:"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne može pristupiti ovoj datoteci"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Ovu datoteku koristi neki drugi proces."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Datoteka: %s"
@@ -7365,33 +7636,33 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nije moguće prepisati postojeću datoteku \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr "Datoteka sa ovim imenom već postoji i nemate privilegijaprepisati je."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Šta želite da uradite?"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "U fasciklu \"%s\" nije moguće pisanje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
@@ -7427,48 +7698,52 @@ msgstr "Datoteka: "
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:87
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s nije ispravan nivo logovanja"
-
-#: ../src/gajim.py:160
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
 
-#: ../src/gajim.py:190
-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 "Gajimu treba pyGTK 2.8 ili veća verzija"
 
-#: ../src/gajim.py:191
-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 "Gajimu treba pyGTK 2.8 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:193
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajimu treba pyGTK 2.8 ili veća verzija"
 
-#: ../src/gajim.py:194
-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 "Gajimu treba pyGTK 2.8 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ nema podršku za libglade"
 
-#: ../src/gajim.py:201
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7477,21 +7752,21 @@ msgstr ""
 "Molimo uklonite Vaš trenutni GTK+ i instalirajte poslednju stabilnu verziju "
 "sa %s"
 
-#: ../src/gajim.py:203
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Molimo proverite da GTK+ i PyGTK imaju podršku za libglade na Vašem sistemu"
 
-#: ../src/gajim.py:208
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajimu treba PySQLite2 za pokretanje"
 
-#: ../src/gajim.py:216
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:217
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7501,11 +7776,11 @@ msgstr ""
 "naći na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:370
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:371
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7513,25 +7788,35 @@ msgstr ""
 "Jedna instanca Gajima izgleda već radi\n"
 "Svejedno želite pokrenuti?"
 
-#: ../src/gajim.py:497
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gajim.py:498
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
+#: ../src/gajim.py:443
+#, fuzzy
+msgid "GPG key expired"
+msgstr "Nema dodeljenog GPG ključa"
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "Povezaćete se na %s bez OpenPGP ključa."
+
 #. ask again
-#: ../src/gajim.py:513
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gajim.py:514
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
-#: ../src/gajim.py:561
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7542,50 +7827,59 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: ../src/gajim.py:575
+#: ../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 "Prihvatate li ovaj zahtev?"
 
-#: ../src/gajim.py:577
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gajim.py:580
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:628 ../src/notify.py:491 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gajim.py:934 ../src/gajim.py:938
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Greška %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:948 ../src/gajim.py:962
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:994
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "Zahtev za pretplatom"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gajim.py:995
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakt \"%s\" je prihvatio da vidite njegov/njen status."
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gajim.py:1015
+#: ../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?"
@@ -7593,74 +7887,79 @@ msgstr ""
 "Uvek ćete ga/je videti kao da nije na vezi.\n"
 "Da li želite da ga/je uklonite sa liste kontakata?"
 
-#: ../src/gajim.py:1056
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "_Ukini pretplatu"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gajim.py:1232 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je od sada poznat kao %(new_nick)s"
 
-#: ../src/gajim.py:1250 ../src/groupchat_control.py:1339
-#: ../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 je trenutno %(status)s"
 
-#: ../src/gajim.py:1313
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s je postavio temu na %(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:1377 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
-#: ../src/gajim.py:1380
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1382
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
 "korisnika)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1388
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Logovanje u sobi je sada omogućeno"
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Logovanje u sobi je sada onemogućeno"
 
-#: ../src/gajim.py:1392
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: ../src/gajim.py:1395
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: ../src/gajim.py:1398
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: ../src/gajim.py:1430
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Lozinka potrebna za pridruživanje grupnom razgovoru %s. Unesite je."
 
-#: ../src/gajim.py:1464
+#: ../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"
@@ -7668,20 +7967,49 @@ msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: ../src/gajim.py:1466
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gajim.py:1469
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gajim.py:1571
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid "GPG key not trusted"
+msgstr "GPG nije upotrebljiv"
+
+#: ../src/gajim.py:1528
+#, fuzzy
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+"Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
+"poruke."
+
+#: ../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 "_Ne pitaj me više"
+
+#: ../src/gajim.py:1540
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+"Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tpravilno startovan"
+"(promenljive okruženja verovatno nisu \t\t\t\t\t\t\tpravilno podešene)"
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1573
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -7689,7 +8017,7 @@ msgstr[0] "Imate %d novi e-mejl razgovor"
 msgstr[1] "Imate %d nova e-mejl razgovora"
 msgstr[2] "Imate %d novih e-mejl razgovora"
 
-#: ../src/gajim.py:1586
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7704,34 +8032,44 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1657
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gajim.py:1725
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Uklanja kontakt sa liste"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Greška pri čitanju datoteke:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Uspešno ste primili datoteku %(filename)s od kontakta %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1729
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos datoteke %(filename)s od kontakta %(name)s je zaustavljen."
 
-#: ../src/gajim.py:1742
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Uspešno ste poslali datoteku %(filename)s za kontakt %(name)s"
 
 #. ft stopped
-#: ../src/gajim.py:1746
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos %(filename)s za kontakt %(name)s je zaustavljen. "
 
-#: ../src/gajim.py:1834
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -7740,36 +8078,36 @@ msgstr ""
 "Ne mogu da dešifrujem poruku od kontakta %s\n"
 "Možda je promenjena."
 
-#: ../src/gajim.py:1841
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gajim.py:1912
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gajim.py:1913
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Molimo Vas unesite novo korisničko ime za Vaš lokalni nalog"
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:1949
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gajim.py:1974
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gajim.py:1975
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -7777,11 +8115,11 @@ msgstr ""
 "Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
 "novo ime resursa"
 
-#: ../src/gajim.py:2028
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gajim.py:2029
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7792,19 +8130,19 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gajim.py:2034
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gajim.py:2049
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gajim.py:2050
-#, python-format
+#: ../src/gajim.py:2156
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
@@ -7816,11 +8154,11 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../src/gajim.py:2072 ../src/gajim.py:2102
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: ../src/gajim.py:2073
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7828,16 +8166,11 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
 "želite to da uradite?"
 
-#: ../src/gajim.py:2075 ../src/gajim.py:2105
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: ../src/gajim.py:2076 ../src/gajim.py:2106 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3789
-msgid "Do _not ask me again"
-msgstr "_Ne pitaj me više"
-
-#: ../src/gajim.py:2103
+#: ../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?"
@@ -7845,27 +8178,27 @@ msgstr ""
 "Upravo ćete poslati lozinku preko nesigurne veze. Trebalo bi da instalirate "
 "PyOpenSSL da sprečite ovo. Da li želite da nastavite?"
 
-#: ../src/gajim.py:2120
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: ../src/gajim.py:2121
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2589 ../src/gajim.py:2610
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gajim.py:2590
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Vaša tema za smajlije nije nađena, pa su smajliji isključeni."
 
-#: ../src/gajim.py:2611
+#: ../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 "
@@ -7875,57 +8208,38 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gajim.py:2637 ../src/roster_window.py:3323
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemoguće je pristupiti grupnom razgovoru ako ste nevidljivi"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2917
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: ../src/gajim.py:3014
-msgid "Bookmark already set"
-msgstr "Marker je već postavljen"
-
-#: ../src/gajim.py:3015
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Grupni razgovor \"%s\" je već markiran."
-
-#: ../src/gajim.py:3028
-msgid "Bookmark has been added successfully"
-msgstr "Marker uspešno dodat"
-
-#: ../src/gajim.py:3029
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Možete upravljati Vašim markerima pomoću menija Akcije iz Vaše liste "
-"kontakata."
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Prikazuje pomoć za određenu naredbu"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "naredba"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "prikaži pomoć za komandu"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Prikazuje ili skriva prozor liste kontakata "
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 msgid "Pops up a window with the next pending event"
 msgstr "Iskače prozor sa sledećim događajem na čekanju"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7933,49 +8247,50 @@ msgstr ""
 "Ispisuje listu svih kontakata sa liste kontakata. Svaki kontakt je u "
 "posebnoj liniji"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "nalog"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "prikazuje samo kontakte sa ovog naloga"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Ispisuje listu registrovanih naloga"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Menja status jednog ili više naloga"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "poruka"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusna poruka"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
@@ -7984,19 +8299,23 @@ msgstr ""
 "svih naloga koji imaju uključenu opciju \"sinhronizacija sa globalnim "
 "statusom\""
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Prikazuje dijalog razgovora kako biste mogli razgovarati sa kontaktom"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "Džaber ID kontakta sa kojim želite razgovarati"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "ako je naznačeno, kontakt se uzima sa liste kontakata ovog naloga"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8006,29 +8325,29 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "Džaber ID kontakta koji će primiti poruku"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "sadržaj poruke"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "pgp ključ"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "ako je naznačeno, poruka će biti šifrovana koristeći ovaj javni ključ"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "ako je naznačeno, poruka će biti poslata koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8038,135 +8357,135 @@ msgstr ""
 "želite postaviti samo 'nalog', bez 'OpenPGP ključ', samo postavite 'OpenPGP "
 "ključ' na ''."
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "tema"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "tema poruke"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr "Šalje novu poruku na grupni razgovor kome ste se pridružili."
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "Džaber ID sobe koja će primiti poruku"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Daje detaljne informacije o kontaktu"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "Džaber ID kontakta"
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Daje detaljne informacije o nalogu"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Ime naloga"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Šalje datoteku kontaktu"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "datoteka"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Putanja do datoteke"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "ako je naznačeno, datoteka će biti poslata koriteći ovaj nalog"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Prikazuje sva podešavanja i njihove vrednosti"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Postavlja vrednost 'ključa' na 'vrednost'."
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ključ=vrednost"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr ""
 "'ključ' je ime stavke podešavanja, 'vrednost' je vrednost na koju će se "
 "stavka postaviti"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Briše stavku podešavanja"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ključ"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "ime stavke podešavanja koje će se brisati"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Zapisuje trenutno stanje Gajim podešavanja u .config datoteku"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Dodaje kontakt na listu"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "džid"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Dodaje novi kontakt ovom računu"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "Vraća trenutni status (globalni ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "Vraća trenutnu statusnu poruku (globalnu ako nije naznačen nalog)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Vraća broj nepročitanih poruka"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Otvara dijalog za započinjanje razgovora"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Započinje razgovor, koristeći ovaj nalog"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Šalje korisnički definisan XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML za slanje"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8174,67 +8493,72 @@ msgstr ""
 "Nalog za koji će biti poslan xml ; ako nije određen, xml će biti poslat za "
 "sve naloge"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Upravlja xmpp:/ uri-jem"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Nalog u kome želite da upravljate njime"
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "sadržaj poruke"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Džaber ID sobe:"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Nadimak za korišćenje"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Lozinka za ulazak u sobu"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Nalog sa koga želite da uđete u sobu"
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8243,15 +8567,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Čini se da Gajim ne radi. Ne možete da koristite gajim-remote."
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8260,16 +8584,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8278,7 +8602,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8287,7 +8611,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8296,7 +8620,7 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Loš uri"
 
@@ -8313,175 +8637,178 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Molimo Vas napravite novu čistu temu sa željenim imenom."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "ime teme"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Ne možete izbrisati Vašu trenutnu temu"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Više niste u grupnom razgovoru \"%(room)s\" ili je \"%(nick)s\" otišao."
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr "Stvarno pošalji datoteku?"
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Ako pošaljete datoteku kontaktu %s, on/ona će znati Vaš pravi džaber ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Server Vam je ili dodelio nadimak ili promenio postojeći"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s ima zabranu od člana %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../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 je izbačen iz sobe (%(reason)s)"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1280
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Afilijacija %(nick)s je postavljena na %(affiliation)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Afilijacija %(nick)s je postavljena na %(affiliation)s"
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s od strane %(actor)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Uloga %(nick)s je postavljena na %(role)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-msgid "Invalid nickname"
-msgstr "Neispravan nadimak"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nadimak nije pronađen: %s "
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Ovaj grupni razgovor nema temu"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Pozvali ste %(contact_jid)s u sobu %(room_jid)s"
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "Nadimak nije pronađen: %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 ""
 "Korišćenje: /%s <nadimak|džid> [razlog], zabranjuje pristup DžID-u u sobu. "
 "Nadimak učesnika može biti zamenjen, ali ne i ako sadrži \"@\". Ako je "
 "Džaber ID trenutno u sobi, on/ona će biti izbačen(a). Razmaci u imenima NISU "
 "podržani."
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8489,7 +8816,7 @@ msgid ""
 msgstr ""
 "Način korišćenja: /%s <nadimak>, otvara privatni razgovor sa učesnikom."
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8498,7 +8825,7 @@ msgstr ""
 "Način korišćenja: /%s [razlog], zatvara trenutni prozor ili jezičak, i "
 "prikazuje razlog ako je naznačen."
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8507,7 +8834,7 @@ msgstr ""
 "Način korišćenja: /%s DžID> [razlog], poziva Džaber ID u trenutni grupni "
 "razgovor, opciono dajući razlog."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8516,18 +8843,17 @@ msgstr ""
 "Način korišćenja: /%s <soba>@<server>[/nadimak], nudi mogućnost spajanja na "
 "soba@server koristeći navedeni nadimak."
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "Način korišćenja: /%s <nadimak> [razlog], uklanja učesnika sa zadatim "
 "nadimkom iz grupnog razgovora i opciono prikazuje razlog. NE podržava blanko "
 "znakove u nadimku."
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8536,65 +8862,81 @@ msgstr ""
 "Način korišćenja: /%s <nadimak> [poruka], otvara prozor privatne poruke i "
 "šalje poruku učesniku sa zadatim nadimkom."
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
 "razgovoru."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Način korišćenja: /%s , prikazuje imena učesnika u grupnom razgovoru."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Način korišćenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora."
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 "Način korišćenja: /%s <poruka>, šalje poruku ne gledajući ostale komande."
 
-#: ../src/groupchat_control.py:1837
+#: ../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 ""
+"Način korišćenja: /%s <nadimak>, menja Vaš nadimak u trenutnom grupnom "
+"razgovoru."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Ako zatvorite ovaj prozor, bićete isključeni sa ovoh grupnog razgovora."
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8602,22 +8944,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2390
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2389
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -8646,83 +8988,83 @@ msgstr "Detalji"
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Greška pri učitavanju datoteke"
 
 #. 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 "Nije moguće pisati u %s. Upravljanje sesijama neće biti moguće"
 
 #. 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 nije Vaš podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li da Vam Gajim postane podrazumevani Gajim klijent?"
 
-#: ../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 ""
 "Uvek na startovanju proveravaj da li je Gajim podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: ../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 ""
 "Sliku nije moguće sačuvati u %(type)s formatu. Sačuvati kao %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakti"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../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:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Želite li počistiti bazu podataka? (NE PREPORUČUJE SE AKO JE GAJIM POKRENUT)"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8736,16 +9078,16 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Izvoženje dnevnika istorijata..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s u %(time)s kaže: %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "Da li zaista želite izbrisati dnevnik razgovora označenog kontakta?"
@@ -8753,11 +9095,11 @@ msgstr[1] ""
 "Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
 msgstr[2] ""
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Ova operacija je nepovratna."
 
-#: ../src/history_manager.py:585
+#: ../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] "Da li zaista želite da izbrišete označenu poruku?"
@@ -8788,122 +9130,133 @@ msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Niste povezani na server"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Da li zaista želite da izbrišete označenu poruku?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Poruke"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr "- poruke će biti logovane"
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova samostalna poruka od kontakta %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova privatna poruka sa grupnog razgovora %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 "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Opšte"
+#: ../src/notify.py:555
+#, fuzzy
+msgid "Ignore"
+msgstr "_Ignoriši"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2786
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2789
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2791 ../src/roster_window.py:2802
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "Informacije primljene"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "Ako niste na vezi, ne možete objaviti Baše informacije"
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "Slanje profila..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "Informacije NISU objavljene"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "Publikacija vCard neuspela"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -8911,54 +9264,46 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:944
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1859
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1880
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ako kontakt \"%s\" prihvati ovaj zahtev, znaćete njegov/njen status."
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će Vas kontakt \"%s\" uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:1919
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-"Gnome Keyring je instaliran, ali nije \t\t\t\t\t\t\tpravilno startovan"
-"(promenljive okruženja verovatno nisu \t\t\t\t\t\t\tpravilno podešene)"
-
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1949
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:2118 ../src/roster_window.py:3266
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../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?"
@@ -8966,15 +9311,28 @@ msgstr ""
 "Promena Vašeg statusa u Nevidljiv će rezultovati  odvezivanjem sa tih "
 "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?"
 
-#: ../src/roster_window.py:2145
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2283 ../src/roster_window.py:2520
+#: ../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 "Jeste li sigurni da želite napustiti grupni razgovor \"%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 "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2284
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -8982,16 +9340,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2521
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2524
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -8999,11 +9357,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2528
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2533
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9013,51 +9371,56 @@ msgstr ""
 "transporta: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2667
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2675
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Želite li ukloniti grupu %s sa liste kontakata?"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ujedno uklonja i sve kontakte iz ove grupe iz liste kontakata"
 
-#: ../src/roster_window.py:2773
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" će biti uklonjen sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3131
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9066,11 +9429,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3136
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3140
+#: ../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."
@@ -9078,16 +9441,16 @@ msgstr ""
 "Uklanjanjem ovog kontakta ujedno podrazumevano uklanjate i odobrenje što "
 "znači da će Vas ta osoba uvek videti kao da niste na vezi."
 
-#: ../src/roster_window.py:3143
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Želim da ovaj kontakt zna moj status i nakon uklanjanja"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3147
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3151
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9097,21 +9460,21 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3190
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Morate kreirati nalog pre nego što možete da razgovarate sa ostalim "
 "kontaktima."
 
-#: ../src/roster_window.py:3707
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:3709
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9119,13 +9482,13 @@ msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: ../src/roster_window.py:3783
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Upravo ćete napraviti pseudokontkat. Jeste li sigurni da želite nastaviti?"
 
-#: ../src/roster_window.py:3785
+#: ../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 "
@@ -9135,11 +9498,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:3898
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:3909
+#: ../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:"
@@ -9147,128 +9510,130 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Poslate %s"
+
+#: ../src/roster_window.py:4137
+#, fuzzy, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Šalje datoteku kontaktu"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4586 ../src/roster_window.py:4657
-#: ../src/roster_window.py:4666 ../src/systray.py:219 ../src/systray.py:224
-#: ../src/systray.py:230
+#: ../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 "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4673
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4678
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4715 ../src/systray.py:257
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4735
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:4775
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:4837 ../src/roster_window.py:4946
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:4864
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:4871
-msgid "Mood"
-msgstr "Raspoloženje"
-
-#: ../src/roster_window.py:4875
-msgid "Activity"
-msgstr "Aktivnost"
-
-#: ../src/roster_window.py:4880
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5034
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
 #. Send Group Message
-#: ../src/roster_window.py:5042 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5050
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5054
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Želeo bih Vas dodati na moju listu kontakata"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5587
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Send single message
-#: ../src/roster_window.py:5648
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5704
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5712
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
-#: ../src/roster_window.py:5787
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5794
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
-#: ../src/roster_window.py:5874
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
 #. History manager
-#: ../src/roster_window.py:5987
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5996
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:6206
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
@@ -9285,20 +9650,20 @@ msgstr "Greška u primanju forme za podatke"
 msgid "No result"
 msgstr "Nema rezultata"
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Tema: %s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9313,7 +9678,7 @@ msgstr ""
 "\n"
 "\tDa li su ove stavke prihvatljive?"
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9328,124 +9693,116 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/systray.py:270
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "Džaber 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 ovog grupnog razgovora"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blokiran]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: ../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 "Poslednji status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Na vezi"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Van veze"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Raspoloženje:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Aktivnost:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Pesma:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Slanje"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Završen"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: ../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"
@@ -9461,16 +9818,21 @@ msgstr "?Klijent:Nepoznat"
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Klijent:Nepoznat"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9478,7 +9840,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9486,13 +9848,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "I Vi i Vaš kontakt ste zainteresovani za informacije o prisustvu jedan drugog"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9500,14 +9862,105 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
+
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr ""
+#~ "Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti) džaber "
+#~ "servera "
+
+#~ msgid "Servers Features"
+#~ msgstr "Mogućnosti servera"
+
+#~ msgid "Your JID:"
+#~ msgstr "Vaš džaber ID:"
+
+#~ msgid "Name:"
+#~ msgstr "Ime:"
+
+#~ msgid "_Host:"
+#~ msgstr "_Host:"
+
+#~ msgid "Show _roster"
+#~ msgstr "_Prikaži listu kontakata"
+
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
+
+#~ msgid "Modify Account"
+#~ msgstr "Izmeni nalog"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s od %(artist)s\n"
+#~ "iz %(source)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim nalog %s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#~ msgid "Custom"
+#~ msgstr "Korisnički"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Dupliraj Džaber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Ovaj nalog je već konfigurisan u Gajimu."
+
+#~ msgid "PyOpenSSL"
+#~ msgstr "PyOpenSSL"
+
+#~ msgid "gajim-remote"
+#~ msgstr "gajim-remote"
+
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP"
+
+#~ msgid "gnome-keyring"
+#~ msgstr "gnome-keyring"
+
+#~ msgid ""
+#~ "Requires python-gnome2-extras or compilation of gtkspell module from "
+#~ "Gajim sources."
+#~ msgstr ""
+#~ "Zahteva python-gnome2-extras ili kompajliranje gtkspell modula iz Gajim "
+#~ "izvornog koda."
+
+#~ msgid "Notification-daemon"
+#~ msgstr "Notification-daemon"
+
+#~ msgid "Idle"
+#~ msgstr "U stanju mirovanja"
+
+#~ msgid "Requires compilation of the idle module from Gajim sources."
+#~ msgstr "Zahteva kompajliranje idle modula iz Gajim izvornog koda."
+
+#~ msgid "libsexy"
+#~ msgstr "libsexy"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Prenos datoteke je zaustavljen od kontakta sa druge strane"
+
+#~ msgid "Generic"
+#~ msgstr "Opšte"
+
+#~ msgid "Mood"
+#~ msgstr "Raspoloženje"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivnost"
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"
+msgid "%(0)s o'clock"
+msgstr "%(0)s"
 
-#. 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"
-
-#: ../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: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:3154
+#: ../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: "
@@ -10072,10 +10289,6 @@ msgstr " resurs med prioritet "
 #~ "endast om notify_on_all_muc_messages är satt till True)"
 
 #, fuzzy
-#~ msgid "Add"
-#~ msgstr "Adress"
-
-#, fuzzy
 #~ msgid "Away "
 #~ msgstr "Borta"
 
@@ -10242,10 +10455,6 @@ msgstr " resurs med prioritet "
 #~ 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 ""
 #~ "Om du stänger det här fönstret kommer du bli frånkopplad från det här "
diff --git a/po/uk.po b/po/uk.po
index 65c66547f..1df2df163 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 10:39+0200\n"
-"PO-Revision-Date: 2009-07-14 01:40+0300\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:06+0200\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -107,54 +107,59 @@ msgstr ""
 "SHA1 відбиток сертифікату:\n"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Використовувати розпізнавання на проксі"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "З'єднатись після натискання кнопки «Завершити»"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Майстер створення облікових записів"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Я вже маю обліковий запис, який бажаю _використовувати"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Я бажаю _зареєструвати новий обліковий запис"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../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 ""
 "Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
 "запису"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Керування..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Прокс_і:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Зберегти _пароль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Налаштувати мій профіль після з’єднання"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
+#: ../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."
@@ -162,36 +167,36 @@ msgstr ""
 "Для з’єднання з мережею Jabber вам потрібен обліковий\n"
 "запис."
 
-#: ../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 "Д_одатково"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "_Завершити"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "Назва _вузла:"
 
-#: ../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:57
+#: ../data/glade/accounts_window.glade.h:58
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../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 "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Сервер:"
 
@@ -226,17 +231,17 @@ msgid "Administration operations"
 msgstr "Адміністративні дії"
 
 #: ../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 "Автоматично відновлювати втрачене з'єднання"
 
 #: ../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 "_З'єднуватись після запуску 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 "_Змінити пароль"
 
@@ -253,24 +258,24 @@ msgstr ""
 "іншого. Якщо позначити цей пункт шифрування буде вимкнено TLS"
 
 #: ../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 "Обрати _ключ..."
 
 #: ../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 "Натисніть. щоб змінити пароль цього облікового запису"
 
 #: ../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 ""
 "Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового "
 "запису"
 
 #: ../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 "З'єднання"
 
@@ -280,7 +285,7 @@ msgstr "Редагувати особисті відомості..."
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:20
+#: ../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
@@ -291,10 +296,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:2710
-#: ../src/roster_window.py:5268
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Загальне"
 
@@ -303,7 +308,7 @@ msgid "Hostname: "
 msgstr "Назва вузла: "
 
 #: ../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."
@@ -313,7 +318,7 @@ msgstr ""
 "ймовірністю."
 
 #: ../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"
@@ -330,7 +335,7 @@ msgstr ""
 "config, доступ на запис до якого матимете лише ви"
 
 #: ../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"
@@ -339,7 +344,7 @@ msgstr ""
 "намагатись з'єднатися з вказаним обліковим записом на сервері jabber"
 
 #: ../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 "
@@ -350,13 +355,13 @@ msgstr ""
 "стану цього облікового запису"
 
 #: ../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 "Відомості про вас, які зберігаються на сервері"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1559
-#: ../src/config.py:2066
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Не обрано жодного ключа"
 
@@ -366,19 +371,19 @@ msgstr "Не обрано жодного ключа"
 #. 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:1107
-#: ../src/config.py:1196 ../src/config.py:1464 ../src/config.py:1469
-#: ../src/config.py:1972 ../src/config.py:2052 ../src/config.py:2065
-#: ../src/config.py:3155 ../src/config.py:3223 ../src/dialogs.py:293
+#: ../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:2780 ../src/roster_window.py:2786
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
+#: ../src/roster_window.py:2800
 msgid "None"
 msgstr "Немає"
 
 #: ../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 "Особисті відомості"
@@ -388,12 +393,12 @@ msgid "Port: "
 msgstr "Порт: "
 
 #: ../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 "Пріорите_т:"
 
 #: ../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 "
@@ -404,7 +409,7 @@ msgstr ""
 "клієнтів. Повідомлення про події отримує клієнт з найвищим пріоритетом"
 
 #: ../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 "Пріоритет змінюватиметься залежно від вашого стану."
 
@@ -413,12 +418,12 @@ msgid "Proxy:"
 msgstr "Проксі:"
 
 #: ../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 "Ресур_с:"
 
 #: ../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 "
@@ -437,7 +442,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Зберегти _пароль (небезпечно)"
 
 #: ../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 "Зберігати _журнал спілкування для усіх контактів"
 
@@ -446,12 +451,12 @@ msgid "Send keep-alive packets"
 msgstr "Надсилати пакети підтвердження дієздатності"
 
 #: ../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 "_Синхронізувати стан облікового запису з загальним"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Синхронізувати контакти"
@@ -461,7 +466,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Використовувати _SSL (застаріле)"
 
 #: ../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 "Використовувати проксі передавання файлів"
 
@@ -470,7 +475,7 @@ msgid "_Adjust to status"
 msgstr "_Узгодити зі станом"
 
 #: ../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 "_Назва:"
 
@@ -486,7 +491,12 @@ msgstr "_Узгодити зі станом"
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Використовувати розпізнавання на проксі"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -494,27 +504,27 @@ msgstr ""
 "Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через "
 "незахищеним з’єднанням."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
 msgstr "_З'єднуватись після запуску 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 "Ел. пошта:"
 
-#: ../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 "Ім'я:"
 
-#: ../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 ""
 "Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, "
 "наприклад, 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"
@@ -524,84 +534,85 @@ msgstr ""
 "налаштувань, ви можете налаштувати інший.\n"
 "Можливо, вам також доведеться змінити параметри брандмауера."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:784
+#: ../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 "Прізвище:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Об’є_днати облікові записи"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5219
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Пере_йменувати"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Send _keep-alive packets"
 msgstr "Надсилати пакети підтвердження дієздатності"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Synchroni_ze account status with global status"
 msgstr "_Синхронізувати стан облікового запису з загальним"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 msgid "Use G_PG Agent"
 msgstr "Використовувати _агент GnuPG"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use cust_om hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use cust_om port:"
 msgstr "Використовувати інший порт:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 msgid "_Edit Personal Information..."
 msgstr "Редагувати особисті відомості..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Hostname: "
 msgstr "Назва _вузла:"
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Manage..."
 msgstr "Керування..."
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
 msgid "_Port: "
 msgstr "_Порт:"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Попереджати перед використанням незахищеного з’єднання"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 msgid "_use HTTP__PROXY environment variable"
 msgstr "використовувати змінну середовища HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "gtk-add"
 
-#: ../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 "gtk-close"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "gtk-remove"
 
@@ -937,7 +948,7 @@ msgstr "Востаннє змінено:"
 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 "Ви отримали новий запис:"
 
@@ -1057,7 +1068,7 @@ msgstr "_Додати до реєстру"
 #: ../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:5915
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Журнал"
 
@@ -1165,7 +1176,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показувати контекстне сповіщення про завершення передавання файла"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "_Продовжити"
 
@@ -1201,7 +1212,7 @@ msgstr ""
 "Рядок контакту\n"
 "Заголовок балачки"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:768
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Жирний"
 
@@ -1225,7 +1236,7 @@ msgstr "Пішов"
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:769
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Курсив"
 
@@ -1307,8 +1318,8 @@ msgstr "_Заблокувати"
 
 #: ../data/glade/gc_occupants_menu.glade.h:7
 #: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5247 ../src/roster_window.py:5724
-#: ../src/roster_window.py:5853
+#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
+#: ../src/roster_window.py:5862
 msgid "_Block"
 msgstr "_Заблокувати"
 
@@ -1330,8 +1341,8 @@ msgstr "_Надіслати конфіденційне повідомлення"
 
 #: ../data/glade/gc_occupants_menu.glade.h:13
 #: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5241 ../src/roster_window.py:5718
-#: ../src/roster_window.py:5850
+#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
+#: ../src/roster_window.py:5859
 msgid "_Unblock"
 msgstr "_Розблокувати"
 
@@ -1369,7 +1380,8 @@ msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 "<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2775
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
+#: ../src/dialogs.py:2908
 msgid "Delete"
 msgstr "Вилучити"
 
@@ -1423,7 +1435,7 @@ msgstr "Пошук:"
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1807
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
@@ -1481,7 +1493,7 @@ msgstr "Мінімізувати після автоматичного приє�
 msgid "Print status:"
 msgstr "Показувати стан:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -1510,10 +1522,6 @@ msgid "<b>Settings</b>"
 msgstr "<b>Параметри</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "B_OSH Port:"
-msgstr "П_орт BOSH:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1523,39 +1531,39 @@ 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 "Керування профілями проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Па_роль:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Proxy _Host:"
 msgstr "Проксі-_вузол:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Port:"
 msgstr "Проксі-п_орт:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr "Використовувати HTTP-проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "Use proxy auth_entication"
 msgstr "Використовувати розпізнавання на проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr "_Адреса URL BOSH:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:14
 msgid "_Type:"
 msgstr "Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:16
+#: ../data/glade/manage_proxies_window.glade.h:15
 msgid "_Username:"
 msgstr "_Користувач:"
 
@@ -1606,7 +1614,7 @@ msgstr "Показати профіль контакту (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 "_Надіслати"
 
@@ -2206,7 +2214,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Порядок:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2899
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
@@ -2410,8 +2418,8 @@ msgstr "Вилучити обліковий запис з Gajim та з _сер�
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5734 ../src/roster_window.py:5863
+#: ../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 "В_илучити"
 
@@ -2433,14 +2441,14 @@ msgstr "Редагувати _групи..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5806
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5174 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "За_просити до"
 
@@ -2450,7 +2458,7 @@ msgstr "В_илучити"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5184 ../src/roster_window.py:5772
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
 
@@ -2561,7 +2569,8 @@ msgid "Show _Offline Contacts"
 msgstr "Показувати _від’єднані контакти"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Показати _реєстр"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2619,7 +2628,7 @@ msgid "_Add contact"
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5875
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Інформація"
 
@@ -2737,10 +2746,6 @@ msgstr "Надіслати окреме _повідомлення"
 msgid "Show All Pending _Events"
 msgstr "Показати усі _події з черги"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Показати _реєстр"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Ста_н"
@@ -2849,13 +2854,13 @@ msgstr "Призначити ключ Open_PGP"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5707
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Редагувати _групи"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "Пере_йменувати"
 
@@ -2922,7 +2927,7 @@ msgstr "Ціле число"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:788
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Колір"
 
@@ -2947,6 +2952,11 @@ msgstr "(Немає)"
 msgid "Hidden"
 msgstr "Сховано"
 
+#: ../src/atom_window.py:110
+#, fuzzy, 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
@@ -3057,81 +3067,81 @@ msgid "Spelling language"
 msgstr "Мова перевірки правопису"
 
 #. we are not connected
-#: ../src/chat_control.py:389 ../src/chat_control.py:575
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "З'єднання недоступне"
 
-#: ../src/chat_control.py:390 ../src/chat_control.py:576
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: ../src/chat_control.py:770
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Підкреслити"
 
-#: ../src/chat_control.py:771
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Перекреслити"
 
-#: ../src/chat_control.py:794
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:803
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:875
+#: ../src/chat_control.py:877
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: ../src/chat_control.py:876
+#: ../src/chat_control.py:878
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 "Якщо ви надішлете файл %s, він або вона дізнаються про ваш справжній "
 "ідентифікатор Jabber."
 
-#: ../src/chat_control.py:1266 ../src/chat_control.py:1654
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1295 ../src/chat_control.py:2154
+#: ../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:879
-#: ../src/dialogs.py:1009 ../src/dialogs.py:1733 ../src/dialogs.py:1758
-#: ../src/gajim.py:978 ../src/gajim.py:1716 ../src/roster_window.py:932
-#: ../src/roster_window.py:1564 ../src/roster_window.py:1566
-#: ../src/roster_window.py:1912 ../src/roster_window.py:3147
-#: ../src/roster_window.py:3173 ../src/roster_window.py:5368
-#: ../src/roster_window.py:5553
+#: ../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 "Немає у реєстрі"
 
-#: ../src/chat_control.py:1308
+#: ../src/chat_control.py:1310
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Перелік активних, завершених та зупинених передач файлів"
 
-#: ../src/chat_control.py:1311
+#: ../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:1418 ../src/tooltips.py:626
+#: ../src/chat_control.py:1420 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: ../src/chat_control.py:1420 ../src/tooltips.py:631
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: ../src/chat_control.py:1422 ../src/tooltips.py:636
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: ../src/chat_control.py:1425 ../src/tooltips.py:638
+#: ../src/chat_control.py:1427 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3140,17 +3150,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
 "з <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1549
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s з групової балачки %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1634 ../src/dialogs.py:4244
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:1635
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3158,50 +3168,50 @@ msgstr ""
 "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
 "повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:1644
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:1670
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1672
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:1686
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "є"
 
-#: ../src/chat_control.py:1686
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:1688
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1692
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1696
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "і НЕ уповноваженим"
 
 #. 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:1702
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3210,26 +3220,26 @@ msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Ця команда не підтримується для облікового запису zeroconf."
 
-#: ../src/chat_control.py:1761 ../src/groupchat_control.py:1718
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди:·%s"
 
-#: ../src/chat_control.py:1764 ../src/groupchat_control.py:1731
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Використання: /%s, спорожнить вміст текстового вікна."
 
-#: ../src/chat_control.py:1767 ../src/groupchat_control.py:1736
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Використання: /%s, сховає кнопки балачки."
 
-#: ../src/chat_control.py:1770 ../src/groupchat_control.py:1751
+#: ../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 "
@@ -3239,38 +3249,38 @@ msgstr ""
 "поточної групової балачки. Буде використано третю особу. (наприклад, /%"
 "(command)s впав під стілець.)"
 
-#: ../src/chat_control.py:1775
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Використання: /%s, надсилає луна-імпульс (пінг) контактові"
 
-#: ../src/chat_control.py:1778
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Використання: /%s, надсилає повідомлення контакту"
 
-#: ../src/chat_control.py:1781 ../src/groupchat_control.py:1780
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Довідки для команди /%s не знайдено"
 
-#: ../src/chat_control.py:1912
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:1919
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:1922
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1929
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3278,25 +3288,25 @@ msgstr ""
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: ../src/chat_control.py:1931
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:1965 ../src/chat_control.py:1978
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:1971
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2352
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2353
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3304,15 +3314,15 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: ../src/chat_control.py:2508 ../src/common/connection_handlers.py:2045
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2422 ../src/common/connection.py:1357
-#: ../src/gajim.py:152
+#: ../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 "Помилка бази даних"
 
-#: ../src/chat_control.py:2509
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3321,7 +3331,7 @@ msgstr ""
 "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
 "його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:2739
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
@@ -3410,9 +3420,9 @@ msgstr "Оберіть групові балачки, які ви бажаєте
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:806
-#: ../src/roster_window.py:1568 ../src/roster_window.py:1570
-#: ../src/roster_window.py:5144
+#: ../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 "Групові балачки"
 
@@ -3484,9 +3494,9 @@ msgstr ""
 "згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:100 ../src/common/config.py:468
+#: ../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:3290
+#: ../src/common/optparser.py:482 ../src/gajim.py:3300
 msgid "default"
 msgstr "типовий"
 
@@ -3961,6 +3971,15 @@ msgstr ""
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
 #: ../src/common/config.py:250
+#, fuzzy
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
+"Keyring (за його наявності) для зберігання паролі облікових записів."
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3969,7 +3988,7 @@ msgstr ""
 "контактів у мережі і загальну кількість контактів у рядках облікових записів "
 "і груп."
 
-#: ../src/common/config.py:251
+#: ../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"
@@ -3978,7 +3997,7 @@ msgstr ""
 "непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано "
 "типу"
 
-#: ../src/common/config.py:252
+#: ../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."
@@ -3987,7 +4006,7 @@ msgstr ""
 "у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
 "балачки ще не було відкрито."
 
-#: ../src/common/config.py:253
+#: ../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."
@@ -3996,11 +4015,11 @@ msgstr ""
 "позначками $$ і $$ на зображення за допомогою dvips після перетворення його "
 "на формулу, і показуватиме зображення у вікні балачки."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4008,7 +4027,7 @@ msgstr ""
 "Максимальна кількість рядків, які буде показано протягом спілкування. "
 "Застарілі рядки понад вказане число вилучатимуться."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4017,13 +4036,13 @@ msgstr ""
 "сповіщення (notification-daemon) буде приєднано до піктограми у системному "
 "лотку."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Оберіть інтервал між двома послідовними перевірками на відсутність "
 "активності."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4031,7 +4050,7 @@ msgstr ""
 "За допомогою цього параметра можна регулювати розмір формул latex. Більші "
 "значення відповідають більшим символам формул."
 
-#: ../src/common/config.py:259
+#: ../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 separately)"
@@ -4039,7 +4058,7 @@ msgstr ""
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: ../src/common/config.py:260
+#: ../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!"
@@ -4047,7 +4066,7 @@ msgstr ""
 "Запит повідомлень відсутності до усих відключених контактів при появі з ними "
 "зв’язку.  УВАГА: це призведе до відсилання великої кількості запитів."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4055,7 +4074,7 @@ msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: ../src/common/config.py:279
+#: ../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"
@@ -4064,26 +4083,26 @@ msgstr ""
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, "
 "навіть якщо GPG налаштовано для використання."
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Увімкнути шифрування ESession для цього облікового запису."
 
-#: ../src/common/config.py:288
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
-#: ../src/common/config.py:289
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4091,32 +4110,32 @@ msgstr ""
 "Впорядкований список відокремлених комами типів з’єднання, які має "
 "спробувати програма. Можливі значення: tls, ssl і plain"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль "
 "нешифрованим з’єднанням."
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: ../src/common/config.py:293
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:304
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:305
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:309
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4127,11 +4146,11 @@ msgstr ""
 "з’єднання."
 
 #. yes, no, ask
-#: ../src/common/config.py:311
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4140,15 +4159,15 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: ../src/common/config.py:329
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4156,11 +4175,11 @@ msgstr ""
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: ../src/common/config.py:402
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:403
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4168,101 +4187,101 @@ msgstr ""
 "Чи має Gajim за можливості автоматично запускати шифрований сеанс "
 "спілкування з цим контактом?"
 
-#: ../src/common/config.py:404 ../src/common/config.py:407
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:413
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "all або відокремлені пробілами стани"
 
-#: ../src/common/config.py:414
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' або 'both'"
 
-#: ../src/common/config.py:415 ../src/common/config.py:417
-#: ../src/common/config.py:418 ../src/common/config.py:421
-#: ../src/common/config.py:422
+#: ../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 "'так', 'ні' або ''"
 
-#: ../src/common/config.py:428 ../src/common/pep.py:160
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:430 ../src/common/pep.py:130
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:430
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:431
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:432 ../src/common/pep.py:189
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:447 ../src/config.py:1396
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:450 ../src/common/config.py:451
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
@@ -4271,23 +4290,23 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:471 ../src/common/optparser.py:244
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:475 ../src/common/optparser.py:230
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "морський"
 
@@ -4296,77 +4315,77 @@ msgstr "морський"
 msgid "Unable to load idle module"
 msgstr "Не вдалося завантажити модуль перевірки відсутності активності"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Вузол вказано помилково"
 
-#: ../src/common/connection_handlers.py:238
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Некоректна локальна адреса? :-O"
 
-#: ../src/common/connection_handlers.py:671
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного "
 "проміжку часу"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:684
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
-#: ../src/common/connection_handlers.py:679
+#: ../src/common/connection_handlers.py:685
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: ../src/common/connection_handlers.py:681
+#: ../src/common/connection_handlers.py:687
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/common/connection_handlers.py:681
+#: ../src/common/connection_handlers.py:687
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 "Реєстрація з агентом %(agent)s невдала через помилку %(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:976
-#: ../src/common/connection_handlers.py:2043
-#: ../src/common/connection_handlers.py:2089
-#: ../src/common/connection_handlers.py:2284
-#: ../src/common/connection_handlers.py:2420 ../src/common/connection.py:1355
-#: ../src/gajim.py:366
+#: ../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:1197 ../src/common/connection.py:929
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Невидимість не підтримується"
 
-#: ../src/common/connection_handlers.py:1198 ../src/common/connection.py:930
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1864 ../src/common/connection.py:1170
-#: ../src/config.py:1826 ../src/config.py:1834 ../src/config.py:1877
-#: ../src/config.py:3105 ../src/dataforms_widget.py:537 ../src/dialogs.py:2466
+#: ../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 "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers.py:1865
+#: ../src/common/connection_handlers.py:1892
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Надійшло повідомлення від некоректного JID, це повідомлення було "
 "проігноровано."
 
-#: ../src/common/connection_handlers.py:2046
-#: ../src/common/connection_handlers.py:2092
-#: ../src/common/connection_handlers.py:2287
-#: ../src/common/connection_handlers.py:2423 ../src/common/connection.py:1358
-#: ../src/gajim.py:153
+#: ../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."
@@ -4376,80 +4395,79 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
 "буде втрачено)."
 
-#: ../src/common/connection_handlers.py:2171
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Заборонений псевдонім: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2246
-#: ../src/common/connection_handlers.py:2249
-#: ../src/common/connection_handlers.py:2252
-#: ../src/common/connection_handlers.py:2255
-#: ../src/common/connection_handlers.py:2259 ../src/gajim.py:514
+#: ../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 "Не вдалося приєднатися до групової балачки"
 
-#: ../src/common/connection_handlers.py:2247
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вас заблокували у груповій балачці %s."
 
-#: ../src/common/connection_handlers.py:2250
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групової балачки %s не існує."
 
-#: ../src/common/connection_handlers.py:2253
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: ../src/common/connection_handlers.py:2256
+#: ../src/common/connection_handlers.py:2283
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Для групової балачки %s слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: ../src/common/connection_handlers.py:2260
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас немає у списку постійних учасників групової балачки %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2302
+#: ../src/common/connection_handlers.py:2329
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: ../src/common/connection_handlers.py:2312
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися до цієї кімнати замість %s"
 
-#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2360
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "тепер ми підписані на %s"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: ../src/common/connection_handlers.py:2364
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "підписку на %s скасовано"
 
-#: ../src/common/connection_handlers.py:2553
+#: ../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 "
@@ -4460,15 +4478,15 @@ msgstr ""
 "jabberstudio.org/ для його вилучення"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2587
+#: ../src/common/connection_handlers.py:2614
 #: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Не було вказано пароля OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2589
+#: ../src/common/connection_handlers.py:2616
 #: ../src/common/zeroconf/connection_zeroconf.py:177
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
@@ -4601,82 +4619,82 @@ msgstr "До призначення ключа не належить підпи�
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:281
 #: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
 "реєстрації: %(error)s"
 
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Некоректна відповідь"
 
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: %"
 "(error)s"
 
-#: ../src/common/connection.py:636 ../src/common/connection.py:762
-#: ../src/common/connection.py:1510
+#: ../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 "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:637 ../src/gajim.py:1073
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:645
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: ../src/common/connection.py:686 ../src/common/connection.py:742
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: ../src/common/connection.py:687 ../src/common/connection.py:743
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: ../src/common/connection.py:709
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4685,7 +4703,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:714
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4694,24 +4712,24 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: ../src/common/connection.py:763
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
 
-#: ../src/common/connection.py:788
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: ../src/common/connection.py:856
+#: ../src/common/connection.py:865
 msgid "Error while removing privacy list"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4721,17 +4739,17 @@ msgstr ""
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: ../src/common/connection.py:1171 ../src/dialogs.py:2467
+#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Неможливо надіслати повідомлення до %s, вказаний JID не є коректним."
 
-#: ../src/common/connection.py:1193
+#: ../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:1195
+#: ../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."
@@ -4740,11 +4758,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
 
-#: ../src/common/connection.py:1345
+#: ../src/common/connection.py:1359
 #: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
@@ -4754,30 +4772,30 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1372
+#: ../src/common/connection.py:1386
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1375
+#: ../src/common/connection.py:1389
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Запросити _контакти"
 
-#: ../src/common/connection.py:1543 ../src/common/connection.py:1564
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
 #: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:978
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Спостерігачі"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
 #: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:787 ../src/roster_window.py:836
-#: ../src/roster_window.py:1491 ../src/roster_window.py:1560
-#: ../src/roster_window.py:1562 ../src/roster_window.py:1706
+#: ../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 "Транспорти"
 
@@ -4822,153 +4840,153 @@ msgstr ""
 "Спробуйте ознайомитися з вмістом сторінки http://trac.gajim.org/wiki/"
 "GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "дванадцята"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "перша"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "друга"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "третя"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "четверта"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "п’ята"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "шоста"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "сьома"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "восьма"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "дев’ята"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "десята"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "одинадцята"
 
+#. 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 "дванадцята"
-
-#. 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 "п'ять хвилин по $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "п'ять хвилин по %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "десять хвилин по $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "десять хвилин по %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "чверть по $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "чверть по %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "двадцять хвилин по $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "двадцять хвилин по %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "двадцять п'ять хвилин по $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "двадцять п'ять хвилин по %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "пів на $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "пів на %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "за двадцять п'ять хвилин $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "за двадцять п'ять хвилин %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "за двадцять хвилин  $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "за двадцять хвилин  %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "за чверть $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "за чверть %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "за десять хвилин $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "за десять хвилин %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "за п’ять хвилин $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "за п’ять хвилин %(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 "Ніч"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Вдосвіта"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Ранок"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Майже полудень"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Полудень"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Після обіду"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Вечір"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Пізній вечір"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Початок тижня"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Середина тижня"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Кінець тижня"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Вихідні!"
 
@@ -5012,7 +5030,7 @@ msgstr "Вільний для балачки"
 msgid "_Available"
 msgstr "_Доступний"
 
-#: ../src/common/helpers.py:207 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Доступний"
 
@@ -5231,7 +5249,7 @@ msgstr "блакитний"
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "облікового запису %s@%s"
@@ -5961,14 +5979,14 @@ msgid "Contact is offline. Your message could not be sent."
 msgstr ""
 "Контакт перебуває поза мережею. Ваше повідомлення не може бути надіслано."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:588
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Неможливо встановити з’єднання з вузлом: перевищення очікування на "
 "підтвердження можливості надсилання даних."
 
-#: ../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"
@@ -6009,67 +6027,67 @@ msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1318 ../src/dialogs.py:1933 ../src/dialogs.py:1997
-#: ../src/dialogs.py:2686 ../src/disco.py:773 ../src/disco.py:1568
+#: ../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 "Назва"
 
-#: ../src/config.py:1404
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Повторно увійти зараз?"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: ../src/config.py:1533 ../src/config.py:1634
+#: ../src/config.py:1521 ../src/config.py:1643
 msgid "OpenPGP is not usable on this computer"
 msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
-#: ../src/config.py:1670 ../src/config.py:1715
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Непрочитані події"
 
-#: ../src/config.py:1671
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: ../src/config.py:1697
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: ../src/config.py:1698
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: ../src/config.py:1711
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
-#: ../src/config.py:1712
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:1716
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
 "черги подій."
 
-#: ../src/config.py:1722
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
-#: ../src/config.py:1723
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6077,143 +6095,143 @@ msgstr ""
 "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
 "назву."
 
-#: ../src/config.py:1727 ../src/config.py:1731
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Некоректна назва облікового запису"
 
-#: ../src/config.py:1728
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Назва облікового запису не може бути порожньою."
 
-#: ../src/config.py:1732
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:1807
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:1808
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:1835
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2027 ../src/config.py:3165
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2028 ../src/config.py:3166
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2049
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2050
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Виникла проблема з отриманням ваших закритих ключів OpenPGP."
 
-#: ../src/config.py:2085
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2086
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2093
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
 "особистих відомостей."
 
-#: ../src/config.py:2101 ../src/dialogs.py:1785 ../src/dialogs.py:1921
-#: ../src/dialogs.py:2100 ../src/disco.py:441 ../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 "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2106
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2107
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2138
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2139
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
 "повідомлення."
 
-#: ../src/config.py:2322
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2324
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2360
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2363
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2412 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2422
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2429
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2435
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2462
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2464
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6221,11 +6239,11 @@ msgstr ""
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2467
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6233,11 +6251,11 @@ msgstr ""
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2469
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2470
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6245,11 +6263,11 @@ msgstr ""
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2472
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2473
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6257,7 +6275,7 @@ msgstr ""
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2500
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6273,76 +6291,88 @@ msgstr ""
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:2571
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:2593 ../src/gajim.py:1462 ../src/gajim.py:1554
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: ../src/config.py:2594 ../src/gajim.py:1534
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:2595 ../src/gajim.py:1554
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:2604
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:2703
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:2704
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:2772
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
-#: ../src/config.py:3088
-msgid "Invalid username"
-msgstr "Некоректне ім’я користувача"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Некоректний псевдонім"
 
-#: ../src/config.py:3090
-msgid "You must provide a username to configure this account."
-msgstr ""
-"Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Заборонений псевдонім: %s"
+
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Некоректний сервер"
 
-#: ../src/config.py:3122
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Некоректний запис"
+
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3123 ../src/config.py:3314
+#: ../src/config.py:3131 ../src/config.py:3137
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menuitem under the Edit menu from the main "
@@ -6352,26 +6382,35 @@ msgstr ""
 "«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
 "пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3141
-msgid "Invalid server"
-msgstr "Некоректний сервер"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3142
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Некоректне ім’я користувача"
+
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr ""
+"Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr ""
 "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3193 ../src/gajim.py:2101
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3194 ../src/gajim.py:2102
+#: ../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 ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3262
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6386,7 +6425,7 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3268 ../src/gajim.py:2126
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6397,67 +6436,63 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3293 ../src/config.py:3334
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3313
-msgid "Your new account has been created successfully"
-msgstr "Ваш новий обліковий запис було успішно створено"
-
-#: ../src/config.py:3400
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:3554
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:3597
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:3598
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:3600
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:3601
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:3602
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:3603
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:3604
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:3605
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:3606
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
-#: ../src/conversation_textview.py:567
+#: ../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"
@@ -6467,7 +6502,7 @@ msgstr ""
 "отримано співрозмовником. Якщо програма показуватиме\n"
 "цю піктограму довго, ймовірно, повідомлення було втрачено."
 
-#: ../src/conversation_textview.py:586
+#: ../src/conversation_textview.py:589
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6475,56 +6510,56 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:699
+#: ../src/conversation_textview.py:702
 #, fuzzy
 msgid "_Quote"
 msgstr "Ви_йти"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:718
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "У адресі URL словника не вказано «%s», або ключового слова WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:753
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
-#: ../src/conversation_textview.py:1220
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Вчора"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1224
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i днів тому"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1258
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6710,94 +6745,94 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1710
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "У псевдонімі є недозволені символи."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:1713
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:1778 ../src/gajim.py:2774
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:1786
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:1805
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:1876
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:1877 ../src/groupchat_control.py:1473
-#: ../src/groupchat_control.py:1803
-msgid "The nickname has not allowed characters."
-msgstr "У псевдонімі є недозволені символи."
-
-#: ../src/dialogs.py:1881 ../src/dialogs.py:1887
-#: ../src/groupchat_control.py:1991
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1888
-#: ../src/groupchat_control.py:1992
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:1895
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:1922
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: ../src/dialogs.py:1936
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:1969
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: ../src/dialogs.py:1994
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:2052
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:2054
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:2055
+#: ../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:"
@@ -6806,300 +6841,300 @@ msgstr ""
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2079 ../src/dialogs.py:2452 ../src/dialogs.py:2614
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:2080 ../src/dialogs.py:2453 ../src/dialogs.py:2615
+#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:2089 ../src/dialogs.py:2092
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:2092
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:2101
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2120
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2124
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2164 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/dialogs.py:2166 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #. chat message
 #. img to display
-#: ../src/dialogs.py:2168 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
 #: ../src/notify.py:495
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #. single message
-#: ../src/dialogs.py:2168 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
 #: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #. private message
-#: ../src/dialogs.py:2169 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
 #: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/dialogs.py:2169 ../src/gajim.py:1670 ../src/notify.py:505
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2171 ../src/gajim.py:1736 ../src/notify.py:498
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2173 ../src/gajim.py:1636 ../src/gajim.py:1703
+#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
 #: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2175 ../src/gajim.py:1778 ../src/gajim.py:1800
-#: ../src/gajim.py:1817 ../src/notify.py:502
+#: ../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 "Завершення передавання файла"
 
-#: ../src/dialogs.py:2176 ../src/gajim.py:1781 ../src/notify.py:503
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2178 ../src/gajim.py:1483 ../src/notify.py:507
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: ../src/dialogs.py:2180 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/dialogs.py:2371
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2373
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2375
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2378
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2401
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2424
+#: ../src/dialogs.py:2549
 #, python-format
 msgid "Form %s"
 msgstr "Форма %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2503
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:2504
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:2553
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2555
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Set labels
 #. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2665
+#: ../src/dialogs.py:2789
 #, fuzzy, python-format
 msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
 msgstr "Я хочу додати вас до мого списку контактів."
 
-#: ../src/dialogs.py:2683
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr ""
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Смутний"
+
+#: ../src/dialogs.py:2812
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:2689
+#: ../src/dialogs.py:2818
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
-#: ../src/dialogs.py:2720
-msgid "Add"
-msgstr ""
-
-#: ../src/dialogs.py:2751
-#, fuzzy
-msgid "Modify"
-msgstr "Смутний"
-
 #. it is selected
 #. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:2798
+#: ../src/dialogs.py:2929
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
-#: ../src/dialogs.py:2893
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2897
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:2953
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Порядок: %(order)s, дія: %(action)s, тип: %(type)s, значення: %(value)s"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:3000
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:3087
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:3183
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3185
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:3255
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:3256
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:3288
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:3291
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:3293
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:3301
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3303
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:3359
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:3369 ../src/dialogs.py:3423
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:3374
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:3410
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:3428
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:3493
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
 #. # means number
-#: ../src/dialogs.py:3564
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "№"
 
-#: ../src/dialogs.py:3570
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:3688
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "якщо я "
 
-#: ../src/dialogs.py:4160
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7110,19 +7145,19 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4164
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:4170 ../src/dialogs.py:4257
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:4178
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:4183
+#: ../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 "
@@ -7132,19 +7167,19 @@ msgstr ""
 "бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
 "вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:4186 ../src/dialogs.py:4238 ../src/dialogs.py:4251
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:4193
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:4205
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:4206
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7159,24 +7194,24 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4207
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:4239
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 "Ключ контакту (%s) <b>не збігається</b> з ключем, призначеним для нього у "
 "Gajim."
 
-#: ../src/dialogs.py:4245
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/dialogs.py:4252
+#: ../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."
@@ -7185,7 +7220,7 @@ msgstr ""
 "b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
 "встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:4258
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7281,20 +7316,20 @@ msgstr "Опис"
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: ../src/disco.py:1659 ../src/gajim.py:3168
+#: ../src/disco.py:1659 ../src/gajim.py:3178
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/disco.py:1660 ../src/gajim.py:3169
+#: ../src/disco.py:1660 ../src/gajim.py:3179
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/disco.py:1669 ../src/gajim.py:3182
+#: ../src/disco.py:1669 ../src/gajim.py:3192
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/disco.py:1670 ../src/gajim.py:3183
+#: ../src/disco.py:1670 ../src/gajim.py:3193
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
@@ -7319,145 +7354,146 @@ msgstr "_Підписатися"
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 msgid "SSL certificat validation"
 msgstr "Помилка сертифіката SSL"
 
-#: ../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 "Потрібен 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 "Потрібен python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Потрібен pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Command line"
 msgstr "Команди:·%s"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Скрипт для керування Gajim за допомогою командного рядка."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Потрібен 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 "Цією можливістю не можна скористатися у Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "OpenGPG message encryption"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Шифрування повідомлень балачки за допомогою ключів gpg."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Потрібні gpg і 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 "Автоматичне визначення стану мережі."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Потрібні gnome-network-manager і python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Керування сеансами"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 "Збереження сеансу Gajim під час завершення роботи у системі і відновлення "
 "сеансу після входу до системи."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Потрібен python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Password encryption"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Можна зберігати паролі безпечно, не як звичайний текст."
 
-#: ../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 "Потрібні gnome-keyring і 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 "Можливість з’єднання з серверами, які використовують записи SRV."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Потребує dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Для використання SRV-записів потрібен nslookup."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Перевірка правопису"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Перевірка правопису повідомлень, які ви створюєте."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires libgtkspell."
 msgstr "Потрібна бібліотека libxss."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Notification"
 msgstr "Сповіщення"
 
-#: ../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."
@@ -7465,52 +7501,52 @@ msgstr ""
 "Потрібен пакунок python-notify або його замінник: python-dbus разом з "
 "фоновою службою сповіщення (notification-daemon)."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Піктограма лотка"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "Піктограма у системному лотку показує поточний стан присутності."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Потрібен пакунок python-gnome2-extras або модуль піктограми лотка "
 "(trayicon), зібраний з початкових кодів Gajim."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Потрібний PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "_Узгодити зі станом"
 
-#: ../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 "Потрібна бібліотека libxss."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Потрібен 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 "Перетворення виразів LaTeX, обмежених позначками $$."
 
-#: ../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."
@@ -7518,7 +7554,7 @@ msgstr ""
 "Потрібні пакунки texlive-latex-base і dvipng. Крім того, вам слід вказати "
 "для параметра «use_latex» значення «True» у Редакторі додаткових налаштувань."
 
-#: ../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."
@@ -7527,23 +7563,23 @@ msgstr ""
 "також слід встановити для параметра «use_latex» значення «True» у Редакторі "
 "додаткових налаштувань."
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "Шифрування E2E"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "Шифрування повідомлень балачки."
 
-#: ../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 "Потрібен пакунок python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "Інструмент створення RST"
 
-#: ../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)."
@@ -7551,25 +7587,25 @@ msgstr ""
 "Створення XHTML з коду RST (див. http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)."
 
-#: ../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 "Потрібні python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr "Банери та активні посилання"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 "Можливість користуватися натисканням адрес URL у підписах вікон балачки і "
 "групової балачки."
 
-#: ../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 "Потрібен python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Можливість"
 
@@ -7590,7 +7626,7 @@ msgstr "Поступ"
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
 #, python-format
 msgid "Size: %s"
 msgstr "Розмір: %s"
@@ -7607,7 +7643,7 @@ msgstr "Ви"
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:597
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
 #: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Отримувач:"
@@ -7640,84 +7676,85 @@ msgid "Error message: %s"
 msgstr "Повідомлення про помилку: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Передавання файла було зупинене контактом"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Зупинка передавання файла"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Вибрати файл для надсилання..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Опис: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim не може отримати доступу до цього файла"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Цей файл використовується іншим процесом."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:316
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:318
 #, python-format
 msgid "Description: %s"
 msgstr "Опис: %s"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:319
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: ../src/filetransfers_window.py:334 ../src/gtkgui_helpers.py:814
+#: ../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."
 msgstr ""
 "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: ../src/filetransfers_window.py:350 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Що ви хочете зробити?"
 
 #. 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:360 ../src/gtkgui_helpers.py:825
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: ../src/filetransfers_window.py:360 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
-#: ../src/filetransfers_window.py:370
+#: ../src/filetransfers_window.py:369
 msgid "Save File as..."
 msgstr "Зберегти файл як..."
 
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:436
+#: ../src/filetransfers_window.py:435
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7725,32 +7762,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:527
+#: ../src/filetransfers_window.py:526
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:567 ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
 msgid "Invalid File"
 msgstr "Некоректний файл"
 
-#: ../src/filetransfers_window.py:567
+#: ../src/filetransfers_window.py:566
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:571
+#: ../src/filetransfers_window.py:570
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: ../src/filetransfers_window.py:593 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Назва: "
 
-#: ../src/filetransfers_window.py:595 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "Призупинити"
 
@@ -7758,34 +7795,39 @@ msgstr "Призупинити"
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Для роботи Gajim потрібен запущений сервер X. Завершення роботи..."
 
-#: ../src/gajim.py:168
+#: ../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 потрібен PyGTK 2.8 або новіша версія"
 
-#: ../src/gajim.py:169
+#: ../src/gajim.py:171
 #, fuzzy
 msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібен PyGTK 2.8 або новіша версія. Завершення роботи..."
 
-#: ../src/gajim.py:171
+#: ../src/gajim.py:173
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above"
 msgstr "Для роботи Gajim потрібна бібліотека GTK 2.8 або новіша версія"
 
-#: ../src/gajim.py:172
+#: ../src/gajim.py:174
 #, fuzzy
 msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібна бібліотека GTK 2.8 або новіша версія. Завершення "
 "роботи..."
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У середовищі виконання GTK+ відсутня підтримка libglade"
 
-#: ../src/gajim.py:179
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7794,22 +7836,22 @@ msgstr ""
 "Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть останню "
 "стабільну версію цих бібліотек, яку можна знайти за адресою %s"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 "Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на "
 "вашій системі."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Для запуску Gajim потрібен PySQLite2"
 
-#: ../src/gajim.py:194
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Для роботи Gajim потрібен pywin32"
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7819,11 +7861,11 @@ msgstr ""
 "Звантажити цю програму можна за адресою %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:340
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim вже запущено"
 
-#: ../src/gajim.py:341
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7831,35 +7873,35 @@ msgstr ""
 "Здається, вже запущено інший екземпляр Gajim.\n"
 "Запустити ще один екземпляр?"
 
-#: ../src/gajim.py:426
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: ../src/gajim.py:427
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: ../src/gajim.py:441
+#: ../src/gajim.py:443
 msgid "GPG key expired"
 msgstr "Немає ключа GPG"
 
-#: ../src/gajim.py:442
+#: ../src/gajim.py:444
 #, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:451
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: ../src/gajim.py:452
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
 
-#: ../src/gajim.py:515
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7870,54 +7912,58 @@ msgstr ""
 "використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: ../src/gajim.py:529
+#: ../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 "Чи приймаєте ви цей запит?"
 
-#: ../src/gajim.py:531
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: ../src/gajim.py:534
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: ../src/gajim.py:585 ../src/notify.py:511
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/gajim.py:912 ../src/gajim.py:916
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Помилка %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:926 ../src/gajim.py:940
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:967 ../src/notify.py:513
+#: ../src/gajim.py:970 ../src/notify.py:513
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: ../src/gajim.py:992
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: ../src/gajim.py:993
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: ../src/gajim.py:1005
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: ../src/gajim.py:1006
+#: ../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?"
@@ -7925,77 +7971,77 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: ../src/gajim.py:1031 ../src/notify.py:515
+#: ../src/gajim.py:1034 ../src/notify.py:515
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: ../src/gajim.py:1072
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: ../src/gajim.py:1261 ../src/groupchat_control.py:1176
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: ../src/gajim.py:1279 ../src/groupchat_control.py:1359
+#: ../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 тепер %(status)s"
 
-#: ../src/gajim.py:1346
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s встановив тему %(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:1410 ../src/groupchat_control.py:1135
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
-#: ../src/gajim.py:1413
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: ../src/gajim.py:1415
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: ../src/gajim.py:1418
+#: ../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:1421
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: ../src/gajim.py:1423
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: ../src/gajim.py:1428
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: ../src/gajim.py:1431
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: ../src/gajim.py:1463
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
 
-#: ../src/gajim.py:1497
+#: ../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"
@@ -8003,19 +8049,19 @@ msgstr ""
 "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
 "або цей агент повернув помилковий пароль.\n"
 
-#: ../src/gajim.py:1499
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: ../src/gajim.py:1502
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Ваш пароль не є коректним"
 
-#: ../src/gajim.py:1525
+#: ../src/gajim.py:1528
 msgid "GPG key not trusted"
 msgstr "GPG непридатне для використання"
 
-#: ../src/gajim.py:1525
+#: ../src/gajim.py:1528
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -8023,13 +8069,13 @@ msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/gajim.py:1527 ../src/gajim.py:2184 ../src/gajim.py:2219
-#: ../src/groupchat_control.py:1932 ../src/message_window.py:212
-#: ../src/roster_window.py:3897
+#: ../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 "Більше _не питати мене"
 
-#: ../src/gajim.py:1537
+#: ../src/gajim.py:1540
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
 "variable probably not \t\t\t\tcorrectly set)"
@@ -8037,12 +8083,12 @@ msgstr ""
 "Gnome Keyring встановлено, але не \t\t\t\t\tзапущено належним чином "
 "(ймовірно, змінну середовища вказано \t\t\t\t\tнеправильно)"
 
-#: ../src/gajim.py:1647
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нові повідомлення у %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1649
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8050,7 +8096,7 @@ msgstr[0] "Отримано %d новий лист"
 msgstr[1] "Отримано %d нових листи"
 msgstr[2] "Отримано %d нових листів"
 
-#: ../src/gajim.py:1662
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -8065,34 +8111,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1733
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gajim.py:1801
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Вилучає контакт з реєстру"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Помилка під час спроби прочитати файл:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ви успішно отримали %(filename)s від %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1805
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: ../src/gajim.py:1818
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1822
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: ../src/gajim.py:1920
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8101,38 +8157,38 @@ msgstr ""
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: ../src/gajim.py:2001
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: ../src/gajim.py:2002
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: ../src/gajim.py:2014
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Гу?"
 
-#: ../src/gajim.py:2027
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Помилка."
 
-#: ../src/gajim.py:2063
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: ../src/gajim.py:2064
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8140,11 +8196,11 @@ msgstr ""
 "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
 "ласка, вкажіть інший ресурс"
 
-#: ../src/gajim.py:2123
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8155,15 +8211,15 @@ msgstr ""
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: ../src/gajim.py:2129
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: ../src/gajim.py:2149
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8180,11 +8236,11 @@ msgstr ""
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: ../src/gajim.py:2180 ../src/gajim.py:2215
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: ../src/gajim.py:2181
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -8192,11 +8248,11 @@ msgstr ""
 "Ви маєте намір надіслати ваш пароль нешифрованим з’єднанням. Виконати "
 "надсилання пароля?"
 
-#: ../src/gajim.py:2183 ../src/gajim.py:2218
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: ../src/gajim.py:2216
+#: ../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?"
@@ -8205,27 +8261,27 @@ msgstr ""
 "безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
 "зараз?"
 
-#: ../src/gajim.py:2236
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr "Вузол повідомлення про стан було вилучено"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2731 ../src/gajim.py:2753
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: ../src/gajim.py:2732
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: ../src/gajim.py:2754
+#: ../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 "
@@ -8235,13 +8291,13 @@ msgstr ""
 "формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
 "адресою http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gajim.py:2780 ../src/roster_window.py:3381
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Ви не можете приєднуватися до групової балачки зі станом «невидимий»"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3059
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
@@ -8276,12 +8332,12 @@ msgstr ""
 "показано у окремому рядку"
 
 #: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:209
-#: ../src/gajim-remote.py:218 ../src/gajim-remote.py:225
-#: ../src/gajim-remote.py:232 ../src/gajim-remote.py:243
-#: ../src/gajim-remote.py:259 ../src/gajim-remote.py:269
+#: ../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:273
 msgid "account"
 msgstr "обліковий запис"
 
@@ -8306,8 +8362,9 @@ msgstr "стан"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "одне зі значень: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:157
+#: ../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 "повідомлення"
 
@@ -8334,12 +8391,16 @@ msgstr ""
 msgid "JID of the contact that you want to chat with"
 msgstr "JID контакту, з яким ви бажаєте розпочати балачку"
 
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "якщо вказано, контакт буде взято зі списку контактів цього облікового запису"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8350,29 +8411,29 @@ msgstr ""
 "лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' "
 "рівним ''."
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:144
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "JID контакту, який отримає це повідомлення"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:146
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "вміст повідомлення"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "ключ pgp"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "якщо вказано, повідомлення буде зашифровано відкритим ключем"
 
-#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "якщо вказано, повідомлення буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8383,138 +8444,138 @@ msgstr ""
 "лише 'account', без 'OpenPGP key', просто встановіть значення 'OpenPGP key' "
 "рівним ''."
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "тема"
 
-#: ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "тема повідомлення"
 
-#: ../src/gajim-remote.py:154
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 "Надсилає нове повідомлення до групової балачки, до якої ви приєдналися."
 
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:159
 msgid "JID of the room that will receive the message"
 msgstr "JID кімнати, де буде отримано це повідомлення"
 
-#: ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:165 ../src/gajim-remote.py:178
-#: ../src/gajim-remote.py:208 ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "JID контакту"
 
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "Отримує докладні відомості щодо контакту"
 
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "Назва облікового запису"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "Надсилає контакту файл"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "файл"
 
-#: ../src/gajim-remote.py:177
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "Шлях до файла"
 
-#: ../src/gajim-remote.py:179
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "якщо вказано, файл буде надіслано з цього облікового запису"
 
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "Показує список всі параметрів та значення цих параметрів"
 
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "Встановлює значення «ключ» у «значення»"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "ключ=значення"
 
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "«ключ» — це назва параметра, «значення» — значення параметра"
 
-#: ../src/gajim-remote.py:195
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "Вилучає запис параметра"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "ключ"
 
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "назва параметра, який буде вилучено"
 
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Записує поточні значення параметрів Gajim до файла .config"
 
-#: ../src/gajim-remote.py:206
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/gajim-remote.py:215
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "Додає контакт до реєстру"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "jid"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "Додає новий контакт до цього облікового запису"
 
-#: ../src/gajim-remote.py:223
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "Повертає поточний стан (загальний стан, якщо не було вказано облікового "
 "запису)"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr ""
 "Повертає поточне повідомлення стану (загальне повідомлення, якщо не було "
 "вказано облікового запису)"
 
-#: ../src/gajim-remote.py:237
+#: ../src/gajim-remote.py:240
 msgid "Returns number of unread messages"
 msgstr "Повертає кількість непрочитаних повідомлень"
 
-#: ../src/gajim-remote.py:241
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "Відкриває діалогове вікно «Почати балачку»"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "Розпочати балачку з цього облікового запису"
 
-#: ../src/gajim-remote.py:247
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "Надсилає нетиповий XML"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "XML для надсилання"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8522,67 +8583,72 @@ msgstr ""
 "Обліковий запис, на який буде надіслано xml; якщо не вказано, xml буде "
 "надіслано до всіх облікових записів"
 
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr "Обробка xmpp:/ uri"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:258
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr "Адреса URI для обробки"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr "Обліковий запис, який має це обробляти"
 
 #: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "вміст повідомлення"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Приєднатися до кімнати групової балачки"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "кімната"
 
-#: ../src/gajim-remote.py:266
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "JID кімнати"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "псевдонім"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Псевдонім, який слід використовувати"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
 
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Показує або ховає вікно ipython"
 
-#: ../src/gajim-remote.py:305
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: ../src/gajim-remote.py:324
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8591,16 +8657,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: ../src/gajim-remote.py:379
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: ../src/gajim-remote.py:402
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8609,16 +8675,16 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:406
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:410
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: ../src/gajim-remote.py:414
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8627,7 +8693,7 @@ msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: ../src/gajim-remote.py:479
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8636,7 +8702,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:484
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8645,7 +8711,7 @@ msgstr ""
 "Не було вказано аргумент \"%(arg)s\". \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:503
+#: ../src/gajim-remote.py:507
 msgid "Wrong uri"
 msgstr "Помилкова адреса uri"
 
@@ -8662,15 +8728,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Будь ласка, спершу створіть нову порожню тему з бажаною назвою."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "назва теми"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Ви не можете вилучати вашої поточної теми"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Будь ласка, спершу змініть тему на іншу."
 
@@ -8685,123 +8751,117 @@ msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Ви полишили групову балачку «%(room)s» або це зробив (зробила) «%(nick)s»."
 
-#: ../src/groupchat_control.py:410
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: ../src/groupchat_control.py:562
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: ../src/groupchat_control.py:564
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1143
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s було викинуто %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1160
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1164
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1174 ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1212 ../src/groupchat_control.py:1216
-#: ../src/groupchat_control.py:1221
+#: ../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 було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1212
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1218
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** Належність %(nick)s було встановлено у значення %(affiliation)s %(actor)s"
 
-#: ../src/groupchat_control.py:1304
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1319
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s %(actor)s"
 
-#: ../src/groupchat_control.py:1323
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1352
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1357
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1472 ../src/groupchat_control.py:1802
-msgid "Invalid nickname"
-msgstr "Некоректний псевдонім"
-
-#: ../src/groupchat_control.py:1497 ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдоніма не знайдено: %s"
 
-#: ../src/groupchat_control.py:1531
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "У цієї групової балачки немає певної теми"
 
-#: ../src/groupchat_control.py:1543
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "%(contact_jid)s запрошено до %(room_jid)s."
@@ -8815,19 +8875,19 @@ msgstr ""
 
 #. We can't do the difference between nick and reason
 #. So we don't say the nick
-#: ../src/groupchat_control.py:1614 ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
 #, fuzzy
 msgid "Nickname not found"
 msgstr "Псевдоніма не знайдено: %s"
 
-#: ../src/groupchat_control.py:1638
+#: ../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:1721
+#: ../src/groupchat_control.py:1728
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
@@ -8840,7 +8900,7 @@ msgstr ""
 "участь у груповій балачці, її буде викинуто з балачки. Пробіли у псевдонімі "
 "НЕ підтримуються."
 
-#: ../src/groupchat_control.py:1727
+#: ../src/groupchat_control.py:1734
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8849,7 +8909,7 @@ msgstr ""
 "Використання: /%s <nickname>, відкрити вікно конфіденційної балачки з "
 "вказаним учасником."
 
-#: ../src/groupchat_control.py:1733
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8858,7 +8918,7 @@ msgstr ""
 "Використання: /%s [причина], закрити поточне вікно або вкладку з показом "
 "причини, якщо таку вказано."
 
-#: ../src/groupchat_control.py:1739
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8867,7 +8927,7 @@ msgstr ""
 "Використання: /%s <JID> [причина], запросити JID до групової балачки з "
 "необов’язковим зазначенням причини."
 
-#: ../src/groupchat_control.py:1743
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8876,7 +8936,7 @@ msgstr ""
 "Використання: /%s <кімната>@<сервер>[/псевдонім], приєднатися до кімнати на "
 "сервері з необов’язковим вказаним псевдонімом."
 
-#: ../src/groupchat_control.py:1747
+#: ../src/groupchat_control.py:1754
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -8886,7 +8946,7 @@ msgstr ""
 "псевдонімом з групової балачки з необов’язковим зазначенням причини. Пробіли "
 "у псевдонімах НЕ підтримуються."
 
-#: ../src/groupchat_control.py:1755
+#: ../src/groupchat_control.py:1762
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8895,25 +8955,25 @@ msgstr ""
 "Використання: /%s <nickname> [message], відкрити вікно конфіденційного "
 "повідомлення і надіслати це повідомлення учаснику з вказаним псевдонімом."
 
-#: ../src/groupchat_control.py:1760
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr ""
 "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
 "балачці."
 
-#: ../src/groupchat_control.py:1764
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Використання: /%s , показати імена учасників групової балачки."
 
-#: ../src/groupchat_control.py:1768
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Використання: /%s [тема], показати або оновити поточну тему групової балачки."
 
-#: ../src/groupchat_control.py:1771
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8921,14 +8981,14 @@ msgstr ""
 "Використання: /%s <message>, надіслати повідомлення без використання інших "
 "команд."
 
-#: ../src/groupchat_control.py:1774
+#: ../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:1777
+#: ../src/groupchat_control.py:1784
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
@@ -8937,39 +8997,39 @@ msgstr ""
 "Використання: /%s <псевдонім>, змінити ваш псевдонім у поточній груповій "
 "балачці."
 
-#: ../src/groupchat_control.py:1926
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:1928
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:1965
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:1966
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:1970
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:1971
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1998
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:1999
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8977,22 +9037,22 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:2001
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2172
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:2173 ../src/groupchat_control.py:2478
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2477
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -9256,18 +9316,18 @@ msgstr "_Ігнорувати"
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2825
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2828
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2830 ../src/roster_window.py:2841
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
@@ -9300,46 +9360,46 @@ msgid ""
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:961
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1892
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:1913
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:1914
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:1926
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:1952
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3325
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3326
+#: ../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?"
@@ -9347,28 +9407,28 @@ msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2231
+#: ../src/roster_window.py:2240
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2232
+#: ../src/roster_window.py:2241
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/roster_window.py:2233
+#: ../src/roster_window.py:2242
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2324 ../src/roster_window.py:2561
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2334
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9376,16 +9436,16 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: ../src/roster_window.py:2562
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2565
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2566
+#: ../src/roster_window.py:2575
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9393,11 +9453,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: ../src/roster_window.py:2569
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2574
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9407,56 +9467,56 @@ msgstr ""
 "допомогою цих транспортів: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:2713
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:2714
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:2771
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:2772
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:2773
+#: ../src/roster_window.py:2782
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:2812
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:2813
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3165
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "Ви збираєтесь вилучити \"%(name)s\" (%(jid)s) з вашого реєстру.\n"
 
-#: ../src/roster_window.py:3170
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9465,11 +9525,11 @@ msgstr ""
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3176
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3179
+#: ../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."
@@ -9477,16 +9537,16 @@ msgstr ""
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3186
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9496,21 +9556,21 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: ../src/roster_window.py:3247
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3248
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: ../src/roster_window.py:3804
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:3806
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9518,12 +9578,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:3891
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3893
+#: ../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 "
@@ -9533,11 +9593,11 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:4006
+#: ../src/roster_window.py:4015
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:4017
+#: ../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:"
@@ -9545,12 +9605,12 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: ../src/roster_window.py:4122
+#: ../src/roster_window.py:4131
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Надіслати %s"
 
-#: ../src/roster_window.py:4128
+#: ../src/roster_window.py:4137
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Надсилає контакту файл"
@@ -9560,115 +9620,115 @@ msgstr "Надсилає контакту файл"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4711 ../src/roster_window.py:4782
-#: ../src/roster_window.py:4791 ../src/systray.py:216 ../src/systray.py:263
+#: ../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 "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:4798
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:4803
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:4840 ../src/systray.py:279
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4860
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:4900
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:4956 ../src/roster_window.py:5057
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:4991
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
 #. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5679
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
-#: ../src/roster_window.py:5576
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Я хочу додати вас до свого реєстру"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5699
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
 #. Send single message
-#: ../src/roster_window.py:5760
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5816
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
-#: ../src/roster_window.py:5898
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:5905
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
-#: ../src/roster_window.py:5985
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Створити групову балачку"
 
 #. History manager
-#: ../src/roster_window.py:6098
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:6107
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:6264
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
@@ -9689,16 +9749,16 @@ msgstr "Результату немає"
 msgid "Disk WriteError"
 msgstr "Помилка під час запису на диск"
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Тема: %s"
 
-#: ../src/session.py:411 ../src/session.py:446
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
-#: ../src/session.py:413
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9713,7 +9773,7 @@ msgstr ""
 "\n"
 "\tЧи всі вказані параметри є прийнятними?"
 
-#: ../src/session.py:447
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9908,6 +9968,15 @@ msgstr "У черзі немає запитів на підписку."
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "B_OSH Port:"
+#~ msgstr "П_орт BOSH:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Показати _реєстр"
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Передавання файла було зупинене контактом"
+
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Оберіть обліковий запис, з яким слід виконати синхронізацію"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d2e6b5c1d..75053aab9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-11 23:40+0100\n"
-"PO-Revision-Date: 2006-12-04 01:07+0800\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:07+0200\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
 #: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:16
+#: ../data/glade/roster_window.glade.h:17
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
@@ -66,7 +66,7 @@ msgid "_Personal Events"
 msgstr "个人信息"
 
 #: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:24
+#: ../data/glade/roster_window.glade.h:25
 #, fuzzy
 msgid "_Start Chat..."
 msgstr "开始聊天(_S)"
@@ -101,66 +101,65 @@ msgid "<b>Please select a server</b>"
 msgstr ""
 
 #: ../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"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
-msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "点击查看 jabber 服务器特性(如 MSN, ICQ 代理)"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "使用验证"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "当我点击“结束”时连接"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim： 帐户创建向导"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "我已经拥有了一个帐户"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "我想注册一个新帐户(_R)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
 #: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "如果选定，Gajim 会记录本帐户密码"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
-#: ../data/glade/accounts_window.glade.h:34
 msgid "Manage..."
 msgstr "管理..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 #, fuzzy
 msgid "Prox_y:"
 msgstr "代理服务器："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-msgid "Servers Features"
-msgstr "服务器设定"
-
 #: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "当连接上时设置我的模版"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
-#: ../data/glade/accounts_window.glade.h:53
 msgid "Use custom hostname/port"
 msgstr "使用自定义主机名/端口号"
 
@@ -173,31 +172,32 @@ msgstr ""
 "Jabber 网络"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:24
-msgid "Your JID:"
-msgstr "您的 JID："
-
-#: ../data/glade/account_creation_wizard_window.glade.h:25
-#: ../data/glade/roster_window.glade.h:14
+#: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 #, fuzzy
 msgid "_Hostname:"
 msgstr "主机名："
 
+#: ../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(_J)："
+
 #: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "密码(_P)："
 
 #: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "_Port:"
 msgstr "端口(_P)"
 
@@ -205,11 +205,6 @@ msgstr "端口(_P)"
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:31
-#: ../data/glade/manage_proxies_window.glade.h:12
-msgid "_Username:"
-msgstr "用户名(_U)："
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -218,18 +213,16 @@ msgstr "<b>杂项</b>"
 
 #: ../data/glade/account_modification_window.glade.h:2
 #: ../data/glade/accounts_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:1
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/account_modification_window.glade.h:3
 #: ../data/glade/accounts_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:2
 msgid "<b>Personal Information</b>"
 msgstr "<b>个人信息</b>"
 
 #: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:5
+#: ../data/glade/accounts_window.glade.h:6
 msgid "Account"
 msgstr "账户"
 
@@ -238,25 +231,24 @@ msgid "Account Modification"
 msgstr "帐户修改"
 
 #: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:7
+#: ../data/glade/accounts_window.glade.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "管理员列表"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/glade/accounts_window.glade.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "连接丢失后自动重新连接"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:9
-#: ../data/glade/zeroconf_properties_window.glade.h:3
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Gajim 启动时连接(_O)"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "更换密码(_G)"
 
@@ -271,37 +263,35 @@ msgstr ""
 "用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:12
-#: ../data/glade/zeroconf_properties_window.glade.h:4
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "选择您的 OpenPGP 钥匙(_K)..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "点击变更帐户密码"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "连接"
 
 #: ../data/glade/account_modification_window.glade.h:15
-#: ../data/glade/accounts_window.glade.h:17
 msgid "Edit Personal Information..."
 msgstr "编辑个人信息..."
 
 #. 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:1043
-#: ../src/common/helpers.py:1055 ../src/notify.py:501 ../src/notify.py:532
-#: ../src/notify.py:544
+#: ../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"
 
@@ -309,17 +299,14 @@ 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/preferences_window.glade.h:49
-#: ../data/glade/zeroconf_properties_window.glade.h:7
-#: ../src/common/contacts.py:98 ../src/dialogs.py:103 ../src/dialogs.py:111
-#: ../src/dialogs.py:166 ../src/roster_window.py:2673
-#: ../src/roster_window.py:5158
+#: ../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:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "常规"
 
 #: ../data/glade/account_modification_window.glade.h:18
-#: ../data/glade/accounts_window.glade.h:22
 msgid "Hostname: "
 msgstr "主机名："
 
@@ -340,7 +327,6 @@ msgid ""
 msgstr "如果选定，Gajim 会发送数据包防止超时造成的连接断开"
 
 #: ../data/glade/account_modification_window.glade.h:22
-#: ../data/glade/zeroconf_properties_window.glade.h:8
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -349,7 +335,6 @@ msgstr ""
 
 #: ../data/glade/account_modification_window.glade.h:23
 #: ../data/glade/accounts_window.glade.h:27
-#: ../data/glade/zeroconf_properties_window.glade.h:9
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -357,7 +342,6 @@ msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
 
 #: ../data/glade/account_modification_window.glade.h:24
 #: ../data/glade/accounts_window.glade.h:28
-#: ../data/glade/zeroconf_properties_window.glade.h:10
 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 "
@@ -372,43 +356,45 @@ msgid "Information about you, as stored in the server"
 msgstr "服务器中保存的关于您的信息"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1557
-#: ../src/config.py:2057
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. None means no proxy profile selected
+#. boshuseproxy_checkbutton.set_active(False)
+#. self.on_boshuseproxy_checkbutton_toggled(boshuseproxy_checkbutton)
+#. 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:38
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1147
-#: ../src/config.py:1218 ../src/config.py:1465 ../src/config.py:1470
-#: ../src/config.py:1965 ../src/config.py:2043 ../src/config.py:2056
-#: ../src/config.py:3151 ../src/config.py:3219 ../src/dialogs.py:294
-#: ../src/dialogs.py:296 ../src/dialogs.py:523 ../src/roster_window.py:2742
-#: ../src/roster_window.py:2748 ../src/roster_window.py:2753
+#: ../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 "无"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
-#: ../data/glade/zeroconf_properties_window.glade.h:17
 msgid "Personal Information"
 msgstr "个人信息"
 
 #: ../data/glade/account_modification_window.glade.h:31
-#: ../data/glade/accounts_window.glade.h:40
 msgid "Port: "
 msgstr "端口："
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "优先级(_T):"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:42
+#: ../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 "
@@ -418,7 +404,7 @@ msgstr ""
 "据。"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "优先级将根据您的状态自动转换。"
 
@@ -427,13 +413,13 @@ msgid "Proxy:"
 msgstr "代理服务器："
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:43
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "资源(_C)："
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:46
+#: ../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 "
@@ -446,30 +432,25 @@ msgstr ""
 "到服务器的事件响应。"
 
 #: ../data/glade/account_modification_window.glade.h:38
-#: ../data/glade/zeroconf_properties_window.glade.h:18
 msgid "Save _passphrase (insecure)"
 msgstr "保存密文(_P)(不安全)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:47
-#: ../data/glade/zeroconf_properties_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
 #: ../data/glade/account_modification_window.glade.h:41
-#: ../data/glade/accounts_window.glade.h:49
 msgid "Send keep-alive packets"
 msgstr "发送防超时数据包"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/zeroconf_properties_window.glade.h:20
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:51
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 #, fuzzy
 msgid "Synchronise contacts"
@@ -480,21 +461,16 @@ msgid "Use _SSL (legacy)"
 msgstr "使用 SSL(_S) (优先)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "使用文件传输代理服务器"
 
 #: ../data/glade/account_modification_window.glade.h:47
-#: ../data/glade/accounts_window.glade.h:56
 msgid "_Adjust to status"
 msgstr "调整状态(_A)"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "Jabber ID(_J)："
-
 #: ../data/glade/account_modification_window.glade.h:49
+#: ../data/glade/manage_proxies_window.glade.h:13
 #, fuzzy
 msgid "_Name:"
 msgstr "名称(_N)："
@@ -504,31 +480,38 @@ msgstr "名称(_N)："
 msgid "<b>Proxy</b>"
 msgstr "<b>属性</b>"
 
-#: ../data/glade/accounts_window.glade.h:6
+#: ../data/glade/accounts_window.glade.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "调整状态(_A)"
+
+#: ../data/glade/accounts_window.glade.h:7
 msgid "Accounts"
 msgstr "帐户"
 
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "使用验证"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
+
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
-#: ../data/glade/zeroconf_properties_window.glade.h:5
 msgid "E-Mail:"
 msgstr "E-Mail ："
 
-#. XML Console enable checkbutton
-#: ../data/glade/accounts_window.glade.h:18
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "启用"
-
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
-#: ../data/glade/zeroconf_properties_window.glade.h:6
 msgid "First Name:"
 msgstr "姓："
 
@@ -538,7 +521,6 @@ msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr "如果选定，Gajim 会记录本帐户密码"
 
 #: ../data/glade/accounts_window.glade.h:29
-#: ../data/glade/zeroconf_properties_window.glade.h:11
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -548,56 +530,96 @@ msgstr ""
 "您可以考虑下改变现在的防火墙设置。"
 
 #: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:688
+#: ../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:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
-#: ../data/glade/zeroconf_properties_window.glade.h:14
 msgid "Last Name:"
 msgstr "名："
 
-#: ../data/glade/accounts_window.glade.h:35
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "合并帐户(_G)"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:44 ../src/roster_window.py:5109
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "重命名(_N)"
 
-#: ../data/glade/accounts_window.glade.h:52
-msgid "Use GPG _Agent"
+#: ../data/glade/accounts_window.glade.h:47
+#, fuzzy
+msgid "Send _keep-alive packets"
+msgstr "发送防超时数据包"
+
+#: ../data/glade/accounts_window.glade.h:49
+#, fuzzy
+msgid "Synchroni_ze account status with global status"
+msgstr "将帐户状态与全局状态同步(_R)"
+
+#: ../data/glade/accounts_window.glade.h:51
+msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:54
-#: ../data/glade/zeroconf_properties_window.glade.h:21
-msgid "Use custom port:"
+#: ../data/glade/accounts_window.glade.h:52
+#, fuzzy
+msgid "Use cust_om hostname/port"
+msgstr "使用自定义主机名/端口号"
+
+#: ../data/glade/accounts_window.glade.h:53
+#, fuzzy
+msgid "Use cust_om port:"
 msgstr "使用自定义端口："
 
+#: ../data/glade/accounts_window.glade.h:55
+#, fuzzy
+msgid "_Edit Personal Information..."
+msgstr "编辑个人信息..."
+
+#: ../data/glade/accounts_window.glade.h:56
+#, fuzzy
+msgid "_Enable"
+msgstr "启用"
+
+#: ../data/glade/accounts_window.glade.h:57
+#, fuzzy
+msgid "_Hostname: "
+msgstr "主机名："
+
 #: ../data/glade/accounts_window.glade.h:59
+#, fuzzy
+msgid "_Manage..."
+msgstr "管理..."
+
+#: ../data/glade/accounts_window.glade.h:61
+#, fuzzy
+msgid "_Port: "
+msgstr "端口(_P)"
+
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:63
+msgid "_use HTTP__PROXY environment variable"
+msgstr ""
+
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../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 ""
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
-msgid "use HTTP_PROXY environment variable"
-msgstr ""
-
 #: ../data/glade/add_new_contact_window.glade.h:1
 msgid "A_ccount:"
 msgstr "账户(_C)："
@@ -791,7 +813,7 @@ msgid "All statuses"
 msgstr "所有状态"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:102 ../src/common/helpers.py:291
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "离开"
 
@@ -808,7 +830,7 @@ msgid "Have "
 msgstr "有"
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "隐身"
 
@@ -817,7 +839,7 @@ msgid "Launch a command"
 msgstr "启动命令"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "不可用"
 
@@ -942,7 +964,7 @@ msgstr "名："
 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 ""
 
@@ -990,11 +1012,21 @@ msgstr "输入新密码"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>键入新的状态消息</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#, fuzzy
+msgid "Activity:"
+msgstr "活动"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#, fuzzy
+msgid "Mood:"
+msgstr "房间："
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "当前消息："
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "另存为..."
 
@@ -1057,11 +1089,11 @@ msgstr "添加至名单(_A)"
 
 #: ../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:20
+#: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5805
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "历史(_H)"
 
@@ -1171,7 +1203,7 @@ msgstr "该操作会从列表中移除文件传输。如果该传输处于活动
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:793
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -1207,7 +1239,7 @@ msgstr ""
 "联系人栏\n"
 "聊天条"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "粗体"
 
@@ -1227,11 +1259,11 @@ msgstr "Gajim 主题自定义"
 msgid "Gone"
 msgstr "已离开"
 
-#: ../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 "未活动的"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "斜体"
 
@@ -1282,7 +1314,7 @@ msgstr "更换主题(_S)"
 msgid "Configure _Room..."
 msgstr "设置房间(_R)"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 #, fuzzy
 msgid "_Bookmark"
 msgstr "将本房间加入书签(_B)"
@@ -1317,23 +1349,37 @@ msgstr "管理(_A)"
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "成员(_M)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "拥有人(_O)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "发送私聊消息(_S)"
 
-#: ../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 ""
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "语音(_V)"
 
@@ -1342,13 +1388,13 @@ msgstr "语音(_V)"
 msgid "Create new post"
 msgstr "新发表"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:316
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "来自"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:171
-#: ../src/history_manager.py:202
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "主题"
 
@@ -1372,7 +1418,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "Gajim 历史记录管理器"
 
-#: ../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 "删除"
 
@@ -1397,7 +1444,7 @@ msgstr ""
 msgid "_Search Database"
 msgstr "搜索数据库(_S)"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:305
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
 msgid "Conversation History"
 msgstr "对话历史"
 
@@ -1418,7 +1465,7 @@ msgstr "查找"
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1707
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
@@ -1446,8 +1493,8 @@ msgstr "最近："
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1197
-#: ../src/disco.py:1618
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "加入(_J)"
 
@@ -1475,7 +1522,7 @@ msgstr ""
 msgid "Print status:"
 msgstr "打印状态："
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "服务器："
 
@@ -1510,32 +1557,51 @@ msgstr "<b>设置</b>"
 #, fuzzy
 msgid ""
 "HTTP Connect\n"
-"SOCKS5"
+"SOCKS5\n"
+"BOSH"
 msgstr "HTTP 连接"
 
-#: ../data/glade/manage_proxies_window.glade.h:5
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "代理服务器模板管理"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
-msgid "Name:"
-msgstr "名称："
-
 #: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "密码(_W)"
 
 #: ../data/glade/manage_proxies_window.glade.h:8
-msgid "Type:"
-msgstr "类型："
+#, fuzzy
+msgid "Proxy _Host:"
+msgstr "代理服务器："
 
 #: ../data/glade/manage_proxies_window.glade.h:9
-msgid "Use authentication"
-msgstr "使用验证"
+#, fuzzy
+msgid "Proxy _Port:"
+msgstr "端口(_P)"
 
 #: ../data/glade/manage_proxies_window.glade.h:10
-msgid "_Host:"
-msgstr "主机(_H)："
+#, fuzzy
+msgid "Use HTTP prox_y"
+msgstr "使用代理服务器(_U)"
+
+#: ../data/glade/manage_proxies_window.glade.h:11
+#, fuzzy
+msgid "Use proxy auth_entication"
+msgstr "使用验证"
+
+#: ../data/glade/manage_proxies_window.glade.h:12
+#, fuzzy
+msgid "_BOSH URL:"
+msgstr "URL：(_U)"
+
+#: ../data/glade/manage_proxies_window.glade.h:14
+#, fuzzy
+msgid "_Type:"
+msgstr "类型："
+
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "用户名(_U)："
 
 #: ../data/glade/message_window.glade.h:1
 #, fuzzy
@@ -1575,17 +1641,22 @@ msgid "Show a list of emoticons (Alt+M)"
 msgstr "点这里插入表情符 (Alt+M)"
 
 #: ../data/glade/message_window.glade.h:9
+#, fuzzy
+msgid "Show a list of formattings"
+msgstr "点这里插入表情符 (Alt+M)"
+
+#: ../data/glade/message_window.glade.h:10
 msgid "Show a menu of advanced functions (Alt+A)"
 msgstr ""
 
-#: ../data/glade/message_window.glade.h:10
+#: ../data/glade/message_window.glade.h:11
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr ""
 
 #. 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:12
+#: ../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 "发送(_S)"
 
@@ -1690,10 +1761,14 @@ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "允许提示，当我离开/不可用/忙/隐身"
 
 #: ../data/glade/preferences_window.glade.h:26
+msgid "Allow sound when I'm _busy"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:27
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/glade/preferences_window.glade.h:28
 #, fuzzy
 msgid ""
 "Autodetect on every Gajim startup\n"
@@ -1708,20 +1783,20 @@ msgstr ""
 "总是使用 XFCE4 默认应用\n"
 "自定义"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/glade/preferences_window.glade.h:33
 #, fuzzy
 msgid "Chat message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/glade/preferences_window.glade.h:34
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/glade/preferences_window.glade.h:35
 msgid "Configure color and font of the interface"
 msgstr "配置界面颜色与字体"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/glade/preferences_window.glade.h:36
 msgid ""
 "Detached roster with detached chats\n"
 "Detached roster with single chat\n"
@@ -1730,34 +1805,34 @@ msgid ""
 "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/glade/preferences_window.glade.h:41
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:42
 msgid "Display _extra email details"
 msgstr "显示扩展电子邮件详情(_E)"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:43
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:44
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:45
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:46
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:47
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1766,7 +1841,7 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中"
 "显示的聊天状态。"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:48
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact. Here you can specify which chatstates you want to "
@@ -1775,80 +1850,80 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:49
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/glade/preferences_window.glade.h:51
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:52
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:53
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:54
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:55
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:56
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:57
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中联系人名下方显示联系人状态消息"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:58
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:59
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:60
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:61
 msgid ""
 "If checked, Gajim will highlight spelling errors in input fields of chat "
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:62
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1858,21 +1933,21 @@ msgstr ""
 "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
 "请谨慎使用。"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:63
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:64
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:65
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -1881,79 +1956,91 @@ msgstr ""
 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
 "图标方式显示，以表示在线，离开，忙，等等...)"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:66
 msgid ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:67
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr "如果不禁用，Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:68
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:69
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "消息窗口：(_W)"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:70
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:71
+msgid ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+msgstr ""
+
+#: ../data/glade/preferences_window.glade.h:74
 #, fuzzy
 msgid "Notifications"
 msgstr "帐户修改"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:75
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/glade/preferences_window.glade.h:76
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/glade/preferences_window.glade.h:77
 msgid "Notify on new _GMail email"
 msgstr "新 Gmail 邮件通知"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:78
 #, fuzzy
 msgid "Personal Events"
 msgstr "个人信息"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:79
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:80
 msgid ""
 "Pop it up\n"
 "Notify me about it\n"
 "Show only in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:83
 msgid "Preferences"
 msgstr "参数"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:84
+#, fuzzy
+msgid "Show systray:"
+msgstr "在系统托盘中显示事件(_S)"
+
+#: ../data/glade/preferences_window.glade.h:85
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/glade/preferences_window.glade.h:86
 msgid "Sign _out"
 msgstr "退出登录(_O)"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/glade/preferences_window.glade.h:87
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -1961,148 +2048,152 @@ msgstr ""
 "一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息"
 "内容。"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:88
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/glade/preferences_window.glade.h:84 ../src/config.py:400
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "状态"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:90
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "默认状态图标设置:(_I)"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:91
 #, fuzzy
 msgid "Style"
 msgstr "已冻结"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:92
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:93
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
-"status message"
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/glade/preferences_window.glade.h:96
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
-"current status message"
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:99
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:100
 msgid "Use system _default"
 msgstr "使用系统默认(_D)"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:101
 #, fuzzy
 msgid "When new event is received:"
 msgstr "当新事件发生时"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:102
 #, fuzzy
 msgid "_Away after:"
 msgstr "自动离开(_A)："
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/glade/preferences_window.glade.h:103
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/glade/preferences_window.glade.h:104
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:105
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "表情符："
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/glade/preferences_window.glade.h:106
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/glade/preferences_window.glade.h:107
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:108
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:109
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "忽略收到的消息中的扩展内容"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:110
 msgid "_Incoming message:"
 msgstr "抵达的消息：(_I)"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:111
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:112
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:113
 #, fuzzy
 msgid "_Not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:114
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:115
 msgid "_Outgoing message:"
 msgstr "将要送出的消息：(_O)"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:116
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:117
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:118
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/glade/preferences_window.glade.h:119
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:120
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:121
 #, fuzzy
 msgid "in _group chats"
 msgstr "加入群聊(_G)"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:122
 #, fuzzy
 msgid "in _roster"
 msgstr "不在名单中"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:123
 msgid "minutes"
 msgstr "分钟"
 
@@ -2150,7 +2241,7 @@ msgstr "Jabber ID"
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2574
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "私人列表"
 
@@ -2220,127 +2311,127 @@ msgid "<b>Company:</b>"
 msgstr "<b>自定义</b>"
 
 #: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/glade/vcard_information_window.glade.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>声音</b>"
 
 #: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/glade/vcard_information_window.glade.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "部门："
 
 #: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/glade/vcard_information_window.glade.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail ："
 
 #: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/glade/vcard_information_window.glade.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "附加地址："
 
 #. Family Name
 #: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:13
+#: ../data/glade/vcard_information_window.glade.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "家族："
 
 #: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/glade/vcard_information_window.glade.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>自定义</b>"
 
 #. Given Name
 #: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:16
+#: ../data/glade/vcard_information_window.glade.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
 #: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/glade/vcard_information_window.glade.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "主页："
 
 #. Middle Name
 #: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:20
+#: ../data/glade/vcard_information_window.glade.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>添加规则</b>"
 
 #: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/glade/vcard_information_window.glade.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>自定义</b>"
 
 #: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/glade/vcard_information_window.glade.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "昵称："
 
 #: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/glade/vcard_information_window.glade.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "电话号码："
 
 #: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/glade/vcard_information_window.glade.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>条件</b>"
 
 #: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/glade/vcard_information_window.glade.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "邮政编码："
 
 #. Prefix in Name
 #: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:27
+#: ../data/glade/vcard_information_window.glade.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>属性</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:29 ../src/vcard.py:307
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>声音</b>"
 
 #: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:30
+#: ../data/glade/vcard_information_window.glade.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>设置</b>"
 
 #: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/glade/vcard_information_window.glade.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>设置</b>"
 
 #. Suffix in Name
 #: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:36
+#: ../data/glade/vcard_information_window.glade.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>声音</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:39
+#: ../data/glade/vcard_information_window.glade.h:40
 msgid "About"
 msgstr "关于"
 
@@ -2350,17 +2441,17 @@ msgstr "单击以设置您的明细"
 
 #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
 #: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:45
+#: ../data/glade/vcard_information_window.glade.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "格式： YYYY-MM-DD"
 
 #: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/glade/vcard_information_window.glade.h:48
 msgid "Personal Info"
 msgstr "个人信息"
 
 #: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/glade/vcard_information_window.glade.h:50
 msgid "Work"
 msgstr "工作"
 
@@ -2378,8 +2469,8 @@ msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5146
-#: ../src/roster_window.py:5623 ../src/roster_window.py:5752
+#: ../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 "移除(_R)"
 
@@ -2404,14 +2495,14 @@ msgstr "编辑群组"
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5695
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "运行命令..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5064 ../src/roster_window.py:5576
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
@@ -2422,7 +2513,7 @@ msgstr "移除(_R)"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5074 ../src/roster_window.py:5661
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "发送自定义 XML"
@@ -2449,12 +2540,6 @@ msgstr "开始群聊(_C)"
 msgid "_Allow him/her to see my status"
 msgstr "允许他/她查看我的状态(_A)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5137 ../src/roster_window.py:5613
-#: ../src/roster_window.py:5742
-msgid "_Block"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "禁止他/她查看我的状态(_F)"
@@ -2478,17 +2563,35 @@ msgstr "重命名(_R)"
 msgid "_Subscription"
 msgstr "认证(_S)"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5131 ../src/roster_window.py:5607
-#: ../src/roster_window.py:5739
-msgid "_Unblock"
-msgstr ""
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 #, fuzzy
 msgid "_Unignore"
 msgstr "九"
 
+#: ../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 "删除"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "gtk+"
+
 #: ../data/glade/roster_window.glade.h:1
 #, fuzzy
 msgid "Add _Contact..."
@@ -2516,59 +2619,64 @@ msgid "Profile, A_vatar"
 msgstr "模板，明细(V)"
 
 #: ../data/glade/roster_window.glade.h:9
+#, fuzzy
+msgid "Show Only _Active Contacts"
+msgstr "显示离线联系人"
+
+#: ../data/glade/roster_window.glade.h:10
 msgid "Show Trans_ports"
 msgstr "显示代理(_P)"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/glade/roster_window.glade.h:11
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
-#: ../data/glade/roster_window.glade.h:11
-#, fuzzy
-msgid "Show _roster"
+#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "显示名单(_R)"
 
-#: ../data/glade/roster_window.glade.h:12
+#: ../data/glade/roster_window.glade.h:13
 #, fuzzy
 msgid "_Accounts"
 msgstr "帐户"
 
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:13
+#: ../data/glade/roster_window.glade.h:14
 #: ../data/glade/subscription_request_window.glade.h:6
 msgid "_Actions"
 msgstr "动作(_A)"
 
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/glade/roster_window.glade.h:16
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../data/glade/roster_window.glade.h:17 ../src/disco.py:1351
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../data/glade/roster_window.glade.h:18
+#: ../data/glade/roster_window.glade.h:19
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../data/glade/roster_window.glade.h:19
+#: ../data/glade/roster_window.glade.h:20
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/glade/roster_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:22
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../data/glade/roster_window.glade.h:22
+#: ../data/glade/roster_window.glade.h:23
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../data/glade/roster_window.glade.h:23
+#: ../data/glade/roster_window.glade.h:24
 #, fuzzy
 msgid "_Send Single Message..."
 msgstr "发送一条消息...(_M)"
 
-#: ../data/glade/roster_window.glade.h:25
+#: ../data/glade/roster_window.glade.h:26
 msgid "_View"
 msgstr "视图(_V)"
 
@@ -2587,12 +2695,12 @@ msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5764
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 #, fuzzy
 msgid "_Information"
 msgstr "联系人信息"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1209
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "查找(_S)"
 
@@ -2680,10 +2788,6 @@ msgstr "认证请求"
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-msgid "Select the account with which to synchronise"
-msgstr ""
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
@@ -2709,10 +2813,6 @@ msgstr "发送单条消息(_M)"
 msgid "Show All Pending _Events"
 msgstr "显示所有未决事件"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "显示名单(_R)"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "状态(_T)"
@@ -2732,55 +2832,60 @@ msgstr "<b>动作</b>"
 msgid "<b>Client:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/glade/vcard_information_window.glade.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>设置</b>"
+
+#: ../data/glade/vcard_information_window.glade.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID"
 
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/glade/vcard_information_window.glade.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "资源："
 
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/glade/vcard_information_window.glade.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>设置</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:34
+#: ../data/glade/vcard_information_window.glade.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>描述</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/glade/vcard_information_window.glade.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/glade/vcard_information_window.glade.h:41
 msgid "Comments"
 msgstr "注释"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/glade/vcard_information_window.glade.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "设置房间(_R)"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/glade/vcard_information_window.glade.h:43
 #: ../data/glade/zeroconf_information_window.glade.h:1
 msgid "Contact"
 msgstr "联系人"
 
-#: ../data/glade/vcard_information_window.glade.h:43
+#: ../data/glade/vcard_information_window.glade.h:44
 msgid "Contact Information"
 msgstr "联系人信息"
 
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/glade/vcard_information_window.glade.h:47
 msgid "More"
 msgstr "更多"
 
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/glade/vcard_information_window.glade.h:49
 #, fuzzy
 msgid "User avatar:"
 msgstr "选择明细"
@@ -2793,6 +2898,11 @@ msgstr "<b>Jabber 通信</b>"
 msgid "<b>XML Input</b>"
 msgstr "<b>XML 输入</b>"
 
+#. XML Console enable checkbutton
+#: ../data/glade/xml_console_window.glade.h:4
+msgid "Enable"
+msgstr "启用"
+
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
 #: ../data/glade/xml_console_window.glade.h:6
 msgid "Info/Query"
@@ -2821,13 +2931,13 @@ msgstr "指定 Open_PGP 密钥"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5596
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5722
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "重命名(_R)"
 
@@ -2851,30 +2961,26 @@ msgstr "资源："
 msgid "Status:"
 msgstr "状态："
 
-#: ../data/glade/zeroconf_properties_window.glade.h:15
-msgid "Modify Account"
-msgstr "修改帐户"
-
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "联系人信息"
 
-#: ../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 ""
 
-#: ../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 ""
 
@@ -2902,7 +3008,7 @@ msgstr "群组内"
 msgid "Text"
 msgstr "文本"
 
-#: ../src/advanced.py:102
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr ""
 
@@ -2927,230 +3033,267 @@ msgstr "(无)"
 msgid "Hidden"
 msgstr "隐藏"
 
+#: ../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:68
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "English"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Belarusian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "Bulgarian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Breton"
 msgstr "Briton"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "Czech"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "German"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "Greek"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "British"
 msgstr "Briton"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "Spanish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Basque"
 msgstr "Basc"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "French"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "Italian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Norwegian (b)"
 msgstr "Norvegian b"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Norwegian"
 msgstr "Norvegian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "Polish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "Brazilian Portuguese"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "Russian"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 #, fuzzy
 msgid "Serbian"
 msgstr "German"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "Slovak"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "Swedish"
 
-#: ../src/chat_control.py:68
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:332
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:355 ../src/chat_control.py:549
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:356 ../src/chat_control.py:550
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:1147 ../src/chat_control.py:1543
+#: ../src/chat_control.py:772
+#, fuzzy
+msgid "Underline"
+msgstr "下划线"
+
+#: ../src/chat_control.py:773
+#, fuzzy
+msgid "Strike"
+msgstr "昵称"
+
+#: ../src/chat_control.py:796
+#, fuzzy
+msgid "Font"
+msgstr "字号：(_F)"
+
+#: ../src/chat_control.py:805
+#, fuzzy
+msgid "Clear formating"
+msgstr "联系人信息"
+
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr ""
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "启用加密"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1169 ../src/chat_control.py:2037
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:73
-#: ../src/common/helpers.py:303 ../src/conversation_textview.py:845
-#: ../src/dialogs.py:913 ../src/gajim.py:1633 ../src/normal_control.py:483
-#: ../src/roster_window.py:916 ../src/roster_window.py:1542
-#: ../src/roster_window.py:1544 ../src/roster_window.py:1880
-#: ../src/roster_window.py:3111 ../src/roster_window.py:3135
-#: ../src/roster_window.py:5258 ../src/roster_window.py:5442
+#: ../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 "不在名单中"
 
-#: ../src/chat_control.py:1301 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "文件发送、完成和中止的清单"
+
+#: ../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 ""
 
-#: ../src/chat_control.py:1303 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/chat_control.py:1305 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/chat_control.py:1309 ../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"
 "from <i>%(source)s</i>"
 msgstr ""
 
-#: ../src/chat_control.py:1314
-#, fuzzy, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr "\"%(title)s\" %(artist)s"
-
-#: ../src/chat_control.py:1438
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1523 ../src/dialogs.py:3920
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1524
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1533
+#: ../src/chat_control.py:1646
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1558
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1560
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1574
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1576
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1580
+#: ../src/chat_control.py:1694
 #, fuzzy
 msgid "and authenticated"
 msgstr "使用验证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1584
+#: ../src/chat_control.py:1698
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "使用验证"
@@ -3158,33 +3301,33 @@ msgstr "使用验证"
 #. 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:1590
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:1638
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr ""
 
-#: ../src/chat_control.py:1649 ../src/groupchat_control.py:1653
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
 
-#: ../src/chat_control.py:1652 ../src/groupchat_control.py:1667
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "用法：/%s，清除文本窗口。"
 
-#: ../src/chat_control.py:1655 ../src/groupchat_control.py:1672
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "用法：/%s，隐藏聊天按钮。"
 
-#: ../src/chat_control.py:1658 ../src/groupchat_control.py:1688
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, fuzzy, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3192,256 +3335,268 @@ msgid ""
 msgstr ""
 "用法：/%s <动作>，发送动作到当前群聊。使用第三人称。(例如：/%s exploeds)"
 
-#: ../src/chat_control.py:1663
+#: ../src/chat_control.py:1777
 #, fuzzy, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
 
-#: ../src/chat_control.py:1666
+#: ../src/chat_control.py:1780
 #, fuzzy, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "用法：/%s，隐藏聊天按钮。"
 
-#: ../src/chat_control.py:1669 ../src/groupchat_control.py:1711
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "没有 /%s 的帮助信息"
 
-#: ../src/chat_control.py:1800
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:1807
+#: ../src/chat_control.py:1921
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:1810
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1812
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1817
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:1819
+#: ../src/chat_control.py:1933
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1848 ../src/chat_control.py:1861
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1973
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[本条消息已加密]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2225
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/chat_control.py:2376 ../src/common/connection_handlers.py:1859
-#: ../src/common/connection_handlers.py:1905
-#: ../src/common/connection_handlers.py:2093
-#: ../src/common/connection_handlers.py:2219 ../src/common/connection.py:1229
-#: ../src/gajim.py:170
+#: ../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 ""
 
-#: ../src/chat_control.py:2377
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 msgstr ""
 
-#: ../src/chat_control.py:2608
+#: ../src/chat_control.py:2741
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/common/check_paths.py:43
+#: ../src/common/check_paths.py:44
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:110 ../src/common/check_paths.py:121
-#: ../src/common/check_paths.py:128
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:137
+#: ../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 即将退出"
 
-#: ../src/common/check_paths.py:136
+#: ../src/common/check_paths.py:153
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 应为文件但它是一个目录"
 
-#: ../src/common/check_paths.py:152
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
 
-#: ../src/common/commands.py:80
+#: ../src/common/commands.py:79
 #, fuzzy
 msgid "Change status information"
 msgstr "联系人信息"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:92
 #, fuzzy
 msgid "Change status"
 msgstr "联系人状态改变"
 
-#: ../src/common/commands.py:94
+#: ../src/common/commands.py:93
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:99
 #, fuzzy
 msgid "Free for chat"
 msgstr "自由聊天"
 
-#: ../src/common/commands.py:101
+#: ../src/common/commands.py:100
 #, fuzzy
 msgid "Online"
 msgstr "九"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:102
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:103
 #, fuzzy
 msgid "Do not disturb"
 msgstr "不分发。"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:104
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:110
+#: ../src/common/commands.py:109
 #, fuzzy
 msgid "Presence description:"
 msgstr "描述"
 
-#: ../src/common/commands.py:145
+#: ../src/common/commands.py:144
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:177 ../src/common/commands.py:201
+#: ../src/common/commands.py:176 ../src/common/commands.py:200
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "新群聊"
 
-#: ../src/common/commands.py:191
+#: ../src/common/commands.py:190
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
-#: ../src/common/commands.py:195
+#: ../src/common/commands.py:194
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s 加入群聊"
 
-#: ../src/common/commands.py:202
+#: ../src/common/commands.py:201
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:206 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:73 ../src/roster_window.py:788
-#: ../src/roster_window.py:1546 ../src/roster_window.py:1548
-#: ../src/roster_window.py:5034
+#: ../src/common/commands.py:205 ../src/common/contacts.py:94
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "群聊"
 
-#: ../src/common/commands.py:247
+#: ../src/common/commands.py:246
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/common/commands.py:259
+#: ../src/common/commands.py:258
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d 条未读消息 "
 
-#: ../src/common/commands.py:279
+#: ../src/common/commands.py:278
 msgid "All unread messages have been forwarded."
 msgstr ""
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
+msgid "Play sound when user is busy"
+msgstr ""
+
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:87
+#: ../src/common/config.py:79
+msgid "Show only online and free for chat contacts in roster."
+msgstr ""
+
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "转换状态为“离开”之前的时间(分钟)。"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 #, fuzzy
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "发呆导致的离开"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "转换状态为“不可用”之前的时间(分钟)"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 #, fuzzy
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "发呆导致的不可用"
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:111
+#: ../src/common/config.py:89
+msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
+msgstr ""
+
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折叠的列(账户和组)的列表(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:112 ../src/common/config.py:448
-#: ../src/common/optparser.py:215 ../src/common/optparser.py:433
-#: ../src/common/optparser.py:467 ../src/gajim.py:3114
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "默认"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "允许本地连接/ ZeroConf 消息"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "拼写检查的语言"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3451,7 +3606,7 @@ msgstr ""
 "'有时' - 如 iChat 风格每隔几分钟打印时间。\n"
 "'从不' - 从不打印时间。"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:109
 #, fuzzy
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
@@ -3461,16 +3616,16 @@ msgstr ""
 "使用模糊时钟打印时间。模糊度的值从 1 到 4，或者 0 禁用模糊时钟。1 是最精确的"
 "时钟，4 是最不精确的。只在打印时间为 '有时' 时生效。"
 
-#: ../src/common/config.py:124
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "如可能对 * / _ 格式化字串。"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:116
 #, fuzzy
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
@@ -3480,58 +3635,58 @@ msgstr ""
 "为 HTML 使用重构文本标记，如果选择加入 ASCII 格式。(如果您想使用此功能，请安"
 "装 docutils)"
 
-#: ../src/common/config.py:137
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "当在群聊中使用昵称补全时加到昵称后的字母"
 
-#: ../src/common/config.py:138
+#: ../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."
 msgstr "当请求的昵称被群聊中的其他人使用时要加到被请求的昵称后的字母。"
 
-#: ../src/common/config.py:161
+#: ../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 "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr ""
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+上箭头 存储行数。"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3539,11 +3694,11 @@ msgid ""
 msgstr ""
 "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
-#: ../src/common/config.py:179
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:180
+#: ../src/common/config.py:172
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3553,73 +3708,73 @@ msgstr ""
 "如果为真，监听 NetworkManager 和状态改变(被没有监听网络管理器设置为假和它们使"
 "用全局状态同步提供)的基于网络连接的 D-Bus 信号。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "发送聊天状态通知。可以是全部，打字，禁用中的一个。"
 
-#: ../src/common/config.py:182
+#: ../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:184
+#: ../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:185
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:178
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前总是询问。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:179
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr "关闭这个空格分隔的列表中的群聊 JID 标签/窗口前不再询问。"
 
-#: ../src/common/config.py:190
+#: ../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, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
-#: ../src/common/config.py:194
+#: ../src/common/config.py:187
 msgid "Notify of events in the system trayicon."
 msgstr "在系统托盘图标通知事件。"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "只有一个会话时显示标签？"
 
-#: ../src/common/config.py:201
+#: ../src/common/config.py:194
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天窗口中显示标签？"
 
-#: ../src/common/config.py:202
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
-#: ../src/common/config.py:203
-msgid ""
-"When negotiating an encrypted session, should Gajim assume you want your "
-"messages to be logged?"
-msgstr ""
-
-#: ../src/common/config.py:204
+#: ../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 "
@@ -3627,17 +3782,17 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:213
+#: ../src/common/config.py:205
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "聊天状态指示(_F)："
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:210
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分号隔开的群聊中将高亮显示的单词列表。"
 
-#: ../src/common/config.py:219
+#: ../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."
@@ -3645,13 +3800,13 @@ msgstr ""
 "如选是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
 "时才会生效。"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "如选是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
-#: ../src/common/config.py:221
+#: ../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."
@@ -3659,7 +3814,7 @@ msgstr ""
 "如选是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
 "是动态的。"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:214
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3667,23 +3822,23 @@ msgstr ""
 "如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下"
 "方显示状态信息。"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:228
+#: ../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."
 msgstr "如选是， Gajim 会为每一个缓存过久或上次未获得明细的联系人请求明细"
 
-#: ../src/common/config.py:229
+#: ../src/common/config.py:221
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
 msgstr "如选否，您将不再打印聊天中的联系人变更其状态和状态消息的状态行。"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:222
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3696,28 +3851,28 @@ msgstr ""
 "状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印"
 "所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "当联系人登入时的背景色。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "当联系人登出时的背景色。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果为真，还原消息将用较小的字体。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "不显示代理本身的明细。"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "不在系统任务栏显示名单。"
 
-#: ../src/common/config.py:238
+#: ../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 "
@@ -3726,7 +3881,7 @@ msgstr ""
 "如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
 "理器的默认响应)"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:232
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3736,7 +3891,7 @@ msgstr ""
 "止在群聊中发送 SHA 信息。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:243
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3755,65 +3910,65 @@ msgstr ""
 "'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
 "注意，改变该选项后必须重启 Gajim 使设置生效。"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:236
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如选否，您将不会在窗口中看到明细。"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:237
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如选是，按 Escape 键关闭标签/窗口。"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:238
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "在群聊窗口中隐藏标语"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在群聊窗口中隐藏房主列表。"
 
-#: ../src/common/config.py:250
+#: ../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."
 msgstr "在聊天中，只在当前一条消息不是同一人发出的的时候在一行前显示昵称。"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:243
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "发送消息并关闭窗口"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "将会在群聊中使用彩色昵称的颜色列表。"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "当没有新消息时按 Ctrl-Tab 转到下一个撰写标签。"
 
-#: ../src/common/config.py:255
+#: ../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:256
+#: ../src/common/config.py:248
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -3823,128 +3978,148 @@ msgstr ""
 "如果为真，您将可以在修改账户窗口中为您的账户可以设置一个否定优先级。注意！当"
 "您使用否定优先级登入时您将从服务器收不到任何消息。"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../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:259
+#: ../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:260
+#: ../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:261
+#: ../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:262
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../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:267
+#: ../src/common/config.py:260
 msgid ""
-"Valid uri schemes. Only schemes in this list will be made accepted as \"real"
-"\" uri."
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../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 "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: ../src/common/config.py:286
+#: ../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:287
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:292
+#: ../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:294
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../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:297
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../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:316
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3952,266 +4127,302 @@ msgstr ""
 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
 "置(_P)"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:389
+#: ../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:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:390
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:391 ../src/common/config.py:394
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "想要检查拼写的语言"
 
-#: ../src/common/config.py:400
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "全部或空格分隔的状态"
 
-#: ../src/common/config.py:401
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "'是'，'否'或'两者'"
 
-#: ../src/common/config.py:402 ../src/common/config.py:404
-#: ../src/common/config.py:405 ../src/common/config.py:408
-#: ../src/common/config.py:409
+#: ../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 "'是'，'否'或''"
 
-#: ../src/common/config.py:415 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:417 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:418
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:419 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:419
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:420
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:425
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:426
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "自由聊天。"
 
-#: ../src/common/config.py:427 ../src/config.py:1397
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "我现在不可用。"
 
-#: ../src/common/config.py:429
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "不分发。"
 
-#: ../src/common/config.py:430 ../src/common/config.py:431
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "再见！"
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:462
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "当 MUC 信息到达时的声音"
 
-#: ../src/common/config.py:451 ../src/common/optparser.py:229
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:455 ../src/common/optparser.py:215
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers.py:71
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:49
+#: ../src/common/connection_handlers.py:75
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection_handlers.py:233
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/connection_handlers.py:243
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "错误主机"
 
-#: ../src/common/connection_handlers.py:234
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:639
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:930
-#: ../src/common/connection_handlers.py:1857
-#: ../src/common/connection_handlers.py:1903
-#: ../src/common/connection_handlers.py:2091
-#: ../src/common/connection_handlers.py:2217 ../src/common/connection.py:1227
-#: ../src/gajim.py:392
+#: ../src/common/connection_handlers.py:684
+#, fuzzy
+msgid "Registration succeeded"
+msgstr " vCard 发布成功"
+
+#: ../src/common/connection_handlers.py:685
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr ""
+
+#: ../src/common/connection_handlers.py:687
+#, fuzzy
+msgid "Registration failed"
+msgstr "vCard 发布失败"
+
+#: ../src/common/connection_handlers.py:687
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+
+#: ../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:1137 ../src/common/connection.py:848
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "不支持扩展"
 
-#: ../src/common/connection_handlers.py:1138 ../src/common/connection.py:849
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1860
-#: ../src/common/connection_handlers.py:1906
-#: ../src/common/connection_handlers.py:2094
-#: ../src/common/connection_handlers.py:2220 ../src/common/connection.py:1230
-#: ../src/gajim.py:171
+#: ../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 "无效的 Jabber ID"
+
+#: ../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: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."
 "gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "昵称不允许： %s "
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2053
-#: ../src/common/connection_handlers.py:2056
-#: ../src/common/connection_handlers.py:2059
-#: ../src/common/connection_handlers.py:2062
-#: ../src/common/connection_handlers.py:2066 ../src/gajim.py:556
+#: ../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 "无法加入群聊"
 
-#: ../src/common/connection_handlers.py:2054
+#: ../src/common/connection_handlers.py:2274
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "您被该群聊封禁。"
 
-#: ../src/common/connection_handlers.py:2057
+#: ../src/common/connection_handlers.py:2277
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "不存在这样的群聊"
 
-#: ../src/common/connection_handlers.py:2060
+#: ../src/common/connection_handlers.py:2280
 msgid "Group chat creation is restricted."
 msgstr "群聊创建受限。"
 
-#: ../src/common/connection_handlers.py:2063
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection_handlers.py:2067
+#: ../src/common/connection_handlers.py:2287
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在成员名单中。"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2109
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "授权被移除"
 
-#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2143
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "我申请添加您到联系人名单"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2164
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection_handlers.py:2166
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection_handlers.py:2168
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection_handlers.py:2343
+#: ../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 "
@@ -4221,274 +4432,284 @@ msgstr ""
 "单管理工具移除。"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2368
-#: ../src/common/zeroconf/connection_zeroconf.py:172
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "未获得 OpenPGP 密文"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2370
-#: ../src/common/zeroconf/connection_zeroconf.py:174
-#: ../src/roster_window.py:1931 ../src/roster_window.py:1951
+#: ../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 "您将在无 OpenPGP 情况下连接到 %s。"
 
-#: ../src/common/connection.py:66
+#: ../src/common/connection.py:67
 msgid "Unable to get issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:67
+#: ../src/common/connection.py:68
 msgid "Unable to get certificate CRL"
 msgstr ""
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:69
 msgid "Unable to decrypt certificate's signature"
 msgstr ""
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:70
 msgid "Unable to decrypt CRL's signature"
 msgstr ""
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:71
 #, fuzzy
 msgid "Unable to decode issuer public key"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:72
 msgid "Certificate signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:73
 msgid "CRL signature failure"
 msgstr ""
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:74
 msgid "Certificate is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:75
 msgid "Certificate has expired"
 msgstr ""
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:76
 msgid "CRL is not yet valid"
 msgstr ""
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:77
 msgid "CRL has expired"
 msgstr ""
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:78
 msgid "Format error in certificate's notBefore field"
 msgstr ""
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:79
 msgid "Format error in certificate's notAfter field"
 msgstr ""
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:80
 msgid "Format error in CRL's lastUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:81
 msgid "Format error in CRL's nextUpdate field"
 msgstr ""
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:82
 msgid "Out of memory"
 msgstr ""
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:83
 msgid "Self signed certificate"
 msgstr ""
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:84
 msgid "Self signed certificate in certificate chain"
 msgstr ""
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:85
 msgid "Unable to get local issuer certificate"
 msgstr ""
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:86
 msgid "Unable to verify the first certificate"
 msgstr ""
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:87
 msgid "Certificate chain too long"
 msgstr ""
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:88
 msgid "Certificate revoked"
 msgstr ""
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:89
 #, fuzzy
 msgid "Invalid CA certificate"
 msgstr "无效用户名"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:90
 msgid "Path length constraint exceeded"
 msgstr ""
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:91
 msgid "Unsupported certificate purpose"
 msgstr ""
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:92
 msgid "Certificate not trusted"
 msgstr ""
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:93
 msgid "Certificate rejected"
 msgstr ""
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:94
 msgid "Subject issuer mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:95
 msgid "Authority and subject key identifier mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:96
 msgid "Authority and issuer serial number mismatch"
 msgstr ""
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:97
 msgid "Key usage does not include certificate signing"
 msgstr ""
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:98
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:266
-#: ../src/common/zeroconf/connection_zeroconf.py:214
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:267
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:293
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:312
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:325
+#: ../src/common/connection.py:340
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
 #. wrong answer
-#: ../src/common/connection.py:340
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:341
+#: ../src/common/connection.py:356
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:522
-#, fuzzy
-msgid "Connection to proxy failed"
-msgstr "连接失败"
-
-#: ../src/common/connection.py:610 ../src/common/connection.py:711
-#: ../src/common/connection.py:1362
-#: ../src/common/zeroconf/connection_zeroconf.py:248
+#: ../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 "尚未连接到“%s”"
 
-#: ../src/common/connection.py:611 ../src/gajim.py:1052
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/common/connection.py:643 ../src/common/connection.py:691
+#: ../src/common/connection.py:645
+#, fuzzy, python-format
+msgid "Server replied: %s"
+msgstr "保存在： %s"
+
+#: ../src/common/connection.py:658
+#, fuzzy
+msgid "Connection to proxy failed"
+msgstr "连接失败"
+
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:644 ../src/common/connection.py:692
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:666
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:669
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:671
+#: ../src/common/connection.py:720
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:737
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:739
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:800
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "添加服务错误。 %s"
 
-#: ../src/common/connection.py:801
+#: ../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:1094
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../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 "无法发送空文件"
+
+#: ../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:1096
-#: ../src/common/zeroconf/connection_zeroconf.py:383
+#: ../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:1105
+#: ../src/common/connection.py:1257
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
 
-#: ../src/common/connection.py:1217
-#: ../src/common/zeroconf/connection_zeroconf.py:445
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4497,19 +4718,30 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "联系人"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:73
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "旁观者"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:73 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1348 ../src/gajim.py:802 ../src/roster_window.py:818
-#: ../src/roster_window.py:1471 ../src/roster_window.py:1538
-#: ../src/roster_window.py:1540 ../src/roster_window.py:1677
+#: ../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 "代理"
 
@@ -4519,11 +4751,11 @@ msgid "Not in roster"
 msgstr "不在名单中"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:47
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "本机缺少 D-Bus python 绑定"
 
-#: ../src/common/dbus_support.py:48
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
@@ -4552,1122 +4784,1119 @@ msgstr ""
 "会话进程不可用。\n"
 "您可以参考 http://trac.gajim.org/wiki/GajimDBus"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "十二"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "一"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "二"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "三"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "四"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "五"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "六"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "七"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "八"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "九"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "十"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "十一"
 
+#. 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 "十二"
+msgid "%(0)s o'clock"
+msgstr "%(0)s 点钟"
 
-#. 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
-#, fuzzy
-msgid "$0 o'clock"
-msgstr "$0 点钟"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "五过 %(0)s"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-#, fuzzy
-msgid "five past $0"
-msgstr "五过 $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "十过 %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
-msgid "ten past $0"
-msgstr "十过 $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "四分之一过 %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-#, fuzzy
-msgid "quarter past $0"
-msgstr "四分之一过 $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "二十过 %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-#, fuzzy
-msgid "twenty past $0"
-msgstr "二十过 $0"
-
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-#, fuzzy
-msgid "twenty five past $0"
-msgstr "二十五过 $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "二十五过 %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "half past $0"
-msgstr "半过 $0"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "半过 %(0)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-#, fuzzy
-msgid "twenty five to $1"
-msgstr "二十五到 $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "二十五到 %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "twenty to $1"
-msgstr "二十到 $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "二十到 %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-#, fuzzy
-msgid "quarter to $1"
-msgstr "四分之一到 $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "四分之一到 %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "ten to $1"
-msgstr "十到 $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "十到 %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-#, fuzzy
-msgid "five to $1"
-msgstr "五到 $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "五到 %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-#, fuzzy
-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 "夜晚"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "清晨"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "早晨"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "晌午"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "中午"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "下午"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "晚上"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "傍晚"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "一周开始"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "一周中"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "一周末"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "周末"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "无效的用户名特征。"
 
-#: ../src/common/helpers.py:163
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "此处需要服务器地址"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "无效的主机名特征。"
 
-#: ../src/common/helpers.py:176
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
-#. GiB means gibibyte
-#: ../src/common/helpers.py:216
-#, python-format
-msgid "%s GiB"
-msgstr "%s GiB"
-
-#. GB means gigabyte
-#: ../src/common/helpers.py:219
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#. MiB means mibibyte
-#: ../src/common/helpers.py:223
-#, python-format
-msgid "%s MiB"
-msgstr "%s MiB"
-
-#. MB means megabyte
-#: ../src/common/helpers.py:226
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#. KiB means kibibyte
-#: ../src/common/helpers.py:230
-#, python-format
-msgid "%s KiB"
-msgstr "%s KiB"
-
-#. KB means kilo bytes
-#: ../src/common/helpers.py:233
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#. B means bytes
-#: ../src/common/helpers.py:236
-#, python-format
-msgid "%s B"
-msgstr "%s B"
-
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:272
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:284 ../src/features_window.py:121
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:289
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:294
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:307
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:312
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: 无"
 
-#: ../src/common/helpers.py:314
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:318
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:326
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): 无"
 
-#: ../src/common/helpers.py:328
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:337
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:340
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:342
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:350
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:281
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation: 无"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:362
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../src/common/helpers.py:364
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "成员"
 
-#: ../src/common/helpers.py:401
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:403
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:405
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:408
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:410
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
-#: ../src/common/helpers.py:992 ../src/common/helpers.py:999
+#. GiB means gibibyte
+#: ../src/common/helpers.py:653
+#, python-format
+msgid "%s GiB"
+msgstr "%s GiB"
+
+#. GB means gigabyte
+#: ../src/common/helpers.py:656
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#. MiB means mibibyte
+#: ../src/common/helpers.py:660
+#, python-format
+msgid "%s MiB"
+msgstr "%s MiB"
+
+#. MB means megabyte
+#: ../src/common/helpers.py:663
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#. KiB means kibibyte
+#: ../src/common/helpers.py:667
+#, python-format
+msgid "%s KiB"
+msgstr "%s KiB"
+
+#. KB means kilo bytes
+#: ../src/common/helpers.py:670
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#. B means bytes
+#: ../src/common/helpers.py:673
+#, python-format
+msgid "%s B"
+msgstr "%s B"
+
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "发送消息"
 
-#: ../src/common/helpers.py:1005
+#: ../src/common/helpers.py:1174
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1008 ../src/common/helpers.py:1027
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1010
+#: ../src/common/helpers.py:1179
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1017 ../src/common/helpers.py:1024
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 
-#: ../src/common/helpers.py:1057
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
+#: ../src/common/latex.py:123 ../src/common/latex.py:138
+#, python-format
+msgid "Error executing \"%(command)s\": %(error)s"
+msgstr ""
+
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr ""
+
 #. 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 "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:224 ../src/common/optparser.py:225
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:341
+#: ../src/common/optparser.py:356
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "合并日志数据库"
 
-#: ../src/common/passwords.py:92
-#, python-format
-msgid "Gajim account %s"
-msgstr "Gajim 帐户 %s"
+#: ../src/common/passwords.py:123
+#, fuzzy, python-format
+msgid "XMPP account %s@%s"
+msgstr "帐户 %s 的"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr ""
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr ""
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr ""
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr ""
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr ""
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr ""
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 #, fuzzy
 msgid "Aroused"
 msgstr "已暂停"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr ""
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 #, fuzzy
 msgid "Bored"
 msgstr "粗体"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 #, fuzzy
 msgid "Brave"
 msgstr "有"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr ""
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 #, fuzzy
 msgid "Cautious"
 msgstr "聊天"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 #, fuzzy
 msgid "Cold"
 msgstr "粗体"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 #, fuzzy
 msgid "Confident"
 msgstr "内容(_C)"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr ""
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 #, fuzzy
 msgid "Contemplative"
 msgstr "已完成"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 #, fuzzy
 msgid "Contented"
 msgstr "内容(_C)"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr ""
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr ""
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 #, fuzzy
 msgid "Creative"
 msgstr "未活动的"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr ""
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 #, fuzzy
 msgid "Dejected"
 msgstr "删除"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr ""
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 #, fuzzy
 msgid "Disappointed"
 msgstr "禁用"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr ""
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 #, fuzzy
 msgid "Dismayed"
 msgstr "禁用"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 #, fuzzy
 msgid "Distracted"
 msgstr "禁用"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr ""
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr ""
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr ""
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr ""
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr ""
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr ""
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr ""
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 #, fuzzy
 msgid "Grumpy"
 msgstr "群组"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr ""
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr ""
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr ""
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 #, fuzzy
 msgid "Hot"
 msgstr "主机(_H)："
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr ""
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr ""
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr ""
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr ""
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 #, fuzzy
 msgid "Impressed"
 msgstr "消息"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr ""
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr ""
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr ""
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr ""
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr ""
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 #, fuzzy
 msgid "Invincible"
 msgstr "隐身"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr ""
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 #, fuzzy
 msgid "Lonely"
 msgstr "一"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 #, fuzzy
 msgid "Lost"
 msgstr "主机(_H)："
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr ""
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 #, fuzzy
 msgid "Mean"
 msgstr "German"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 #, fuzzy
 msgid "Moody"
 msgstr "修改(_M)"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr ""
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr ""
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 #, fuzzy
 msgid "Offended"
 msgstr "离线"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr ""
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr ""
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 #, fuzzy
 msgid "Proud"
 msgstr "群组"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr ""
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 #, fuzzy
 msgid "Relieved"
 msgstr "十一"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr ""
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr ""
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 #, fuzzy
 msgid "Sad"
 msgstr "已冻结"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr ""
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 #, fuzzy
 msgid "Satisfied"
 msgstr "名："
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr ""
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr ""
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr ""
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 #, fuzzy
 msgid "Sick"
 msgstr "昵称"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 #, fuzzy
 msgid "Sleepy"
 msgstr "正在睡觉"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr ""
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 #, fuzzy
 msgid "Stressed"
 msgstr "街道："
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr ""
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 #, fuzzy
 msgid "Surprised"
 msgstr "订阅"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr ""
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr ""
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 #, fuzzy
 msgid "Tired"
 msgstr "时间"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 #, fuzzy
 msgid "Undefined"
 msgstr "下划线"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr ""
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr ""
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "错误主机"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr ""
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 #, fuzzy
 msgid "Cleaning"
 msgstr "晚上"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 #, fuzzy
 msgid "Cooking"
 msgstr "正在编写"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr ""
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr ""
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr ""
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 #, fuzzy
 msgid "Gardening"
 msgstr "早晨"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr ""
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 #, fuzzy
 msgid "Walking the Dog"
 msgstr "群组内所有"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 #, fuzzy
 msgid "Drinking"
 msgstr "工作"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr ""
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr ""
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr ""
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr ""
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr ""
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr ""
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr ""
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr ""
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr ""
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 #, fuzzy
 msgid "Dancing"
 msgstr "晚上"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "踢出 %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 #, fuzzy
 msgid "Jogging"
 msgstr "加入(_J)"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr ""
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr ""
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 #, fuzzy
 msgid "Skiing"
 msgstr "工作"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr ""
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 #, fuzzy
 msgid "Working out"
 msgstr "工作"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 msgid "Grooming"
 msgstr ""
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr ""
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr ""
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr ""
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 #, fuzzy
 msgid "Shaving"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr ""
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr ""
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr ""
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr ""
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 #, fuzzy
 msgid "Hanging out"
 msgstr "正在更换话题"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 #, fuzzy
 msgid "Hiding"
 msgstr "踢出 %s"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr ""
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 #, fuzzy
 msgid "Praying"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr ""
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 #, fuzzy
 msgid "Thinking"
 msgstr "工作"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 #, fuzzy
 msgid "Relaxing"
 msgstr "高原"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 #, fuzzy
 msgid "Fishing"
 msgstr "踢出 %s"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 #, fuzzy
 msgid "Gaming"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 #, fuzzy
 msgid "Going out"
 msgstr "退出登录(_O)"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 #, fuzzy
 msgid "Partying"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 #, fuzzy
 msgid "Reading"
 msgstr "原因"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 #, fuzzy
 msgid "Rehearsing"
 msgstr "原因"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 #, fuzzy
 msgid "Shopping"
 msgstr "正在睡觉"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 #, fuzzy
 msgid "Smoking"
 msgstr "工作"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr ""
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 #, fuzzy
 msgid "Sunbathing"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr ""
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 #, fuzzy
 msgid "Watching a Movie"
 msgstr "正在看电影"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 #, fuzzy
 msgid "Talking"
 msgstr "吃饭"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr ""
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 #, fuzzy
 msgid "On the Phone"
 msgstr "我在打电话"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr ""
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 #, fuzzy
 msgid "Traveling"
 msgstr "传输中"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 #, fuzzy
 msgid "Commuting"
 msgstr "正在编写"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr ""
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr ""
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr ""
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr ""
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 #, fuzzy
 msgid "On a Train"
 msgstr "作为链接打开(_L)："
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr ""
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 #, fuzzy
 msgid "Walking"
 msgstr "工作"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 #, fuzzy
 msgid "Coding"
 msgstr "正在编写"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr ""
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr ""
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 #, fuzzy
 msgid "Writing"
 msgstr "工作"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:84
+#: ../src/common/socks5.py:86
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "无法绑定端口%s。"
 
-#: ../src/common/socks5.py:85
+#: ../src/common/socks5.py:87
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -5675,33 +5904,28 @@ msgid ""
 msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:278
+#: ../src/common/stanza_session.py:281
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/client_zeroconf.py:408
-msgid ""
-"Connection to host could not be established: Timeout while sending data."
-msgstr "到主机的连接无法建立：发送数据超时。"
-
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:93
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 #, fuzzy, python-format
 msgid ""
 "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 "not valid, so ignored."
 msgstr "您配置主机为 ft_override_host_to_send 高级选项无效，忽略。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "您需要重新连接才能继续收发消息。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahi 错误"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:238
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5710,95 +5934,83 @@ msgstr ""
 "%s\n"
 "本地消息将无法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 #, fuzzy
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 是否已经安装。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:258
-#: ../src/common/zeroconf/connection_zeroconf.py:262
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "无法绑定端口 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:263
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:357
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户“%s”的状态"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:374
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
 msgstr "没有连接或隐身。您的消息将不会被发送。"
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[本条消息已加密]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:457
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 #, fuzzy
 msgid "Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:464
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息将不被发送。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
-#: ../src/common/zeroconf/zeroconf_bonjour.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:590
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr "到主机的连接无法建立：发送数据超时。"
+
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
 
-#: ../src/config.py:150 ../src/config.py:582
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "禁用"
 
-#: ../src/config.py:321
-msgid "Active"
-msgstr "活动"
-
-#: ../src/config.py:329
-msgid "Event"
-msgstr "事件"
-
-#: ../src/config.py:405
+#: ../src/config.py:394
 #, fuzzy
 msgid "Default Message"
 msgstr "默认状态消息"
 
-#: ../src/config.py:412
+#: ../src/config.py:403
 #, fuzzy
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/config.py:454
-msgid "Always use OS/X default applications"
-msgstr ""
-
-#: ../src/config.py:455
-#, fuzzy
-msgid "Custom"
-msgstr "<b>自定义</b>"
-
-#: ../src/config.py:650 ../src/dialogs.py:1209
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:651
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5806,249 +6018,207 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1016
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "状态消息文本"
 
-#: ../src/config.py:1053
-msgid "First Message Received"
-msgstr "最初收到的消息"
-
-#: ../src/config.py:1054
-#, fuzzy
-msgid "Next Message Received Focused"
-msgstr "收到的下一条消息"
-
-#: ../src/config.py:1056
-#, fuzzy
-msgid "Next Message Received Unfocused"
-msgstr "收到的下一条消息"
-
-#: ../src/config.py:1057
-msgid "Contact Connected"
-msgstr "已连接的联系人"
-
-#: ../src/config.py:1058
-msgid "Contact Disconnected"
-msgstr "联系人已断开连接"
-
-#: ../src/config.py:1059
-msgid "Message Sent"
-msgstr "消息已发送"
-
-#: ../src/config.py:1060
-msgid "Group Chat Message Highlight"
-msgstr "群聊消息突出显示"
-
-#: ../src/config.py:1061
-msgid "Group Chat Message Received"
-msgstr "收到的群聊消息"
-
-#: ../src/config.py:1062
-msgid "GMail Email Received"
-msgstr "收到 GMail 邮件"
-
 #. Name column
-#: ../src/config.py:1319 ../src/dialogs.py:1833 ../src/dialogs.py:1897
-#: ../src/disco.py:768 ../src/disco.py:1562 ../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 "名称"
 
-#: ../src/config.py:1405
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1406
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1531 ../src/config.py:1630
-msgid "OpenPGP is not usable in this computer"
+#: ../src/config.py:1521 ../src/config.py:1643
+#, fuzzy
+msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1666 ../src/config.py:1709
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1667
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1693
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1694
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
 
-#: ../src/config.py:1705
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1706
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1710
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1716
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1717
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1721 ../src/config.py:1725
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1722
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1726
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1800
+#: ../src/config.py:1816
 #, fuzzy
 msgid "Rename Account"
 msgstr "帐户管理"
 
-#: ../src/config.py:1801
+#: ../src/config.py:1817
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/config.py:1819 ../src/config.py:1827 ../src/config.py:1870
-#: ../src/config.py:3089 ../src/dataforms_widget.py:536
-msgid "Invalid Jabber ID"
-msgstr "无效的 Jabber ID"
-
-#: ../src/config.py:1828
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:2018 ../src/config.py:3161
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2019 ../src/config.py:3162
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2040
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2041
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:2076
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2077
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:2089
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:2096 ../src/dialogs.py:1685 ../src/dialogs.py:1821
-#: ../src/dialogs.py:2000 ../src/disco.py:439 ../src/profile_window.py:320
+#: ../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 "尚未连接到服务器"
 
-#: ../src/config.py:2097
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2101
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2102
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2133
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2134
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2317
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2319
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2355
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2356
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2357
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2358
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2407 ../src/disco.py:775 ../src/history_manager.py:184
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2415
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2420
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2424
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2449
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2451
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6056,11 +6226,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2453
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2454
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6068,11 +6238,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2456
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2496
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6081,11 +6251,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2459
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2460
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6093,14 +6263,15 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2461
+#: ../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 ""
 "可以是下列形式的一种：\n"
 "1. user@domain/resource (仅有该源匹配).\n"
@@ -6109,84 +6280,91 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2558
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2580 ../src/gajim.py:1424 ../src/roster_window.py:1943
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2581 ../src/roster_window.py:1917
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2582 ../src/roster_window.py:1944
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2591
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2592
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:2688
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2689
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:2690
+#: ../src/config.py:2731
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:2791
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2792
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:3072
-msgid "Invalid username"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+#, fuzzy
+msgid "Invalid nickname"
 msgstr "无效用户名"
 
-#: ../src/config.py:3074
-msgid "You must provide a username to configure this account."
-msgstr "必须提供用户名来配置此账户。"
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "昵称不允许： %s "
 
-#: ../src/config.py:3100
-msgid "Duplicate Jabber ID"
-msgstr "复制 Jabber ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+#, fuzzy
+msgid "Invalid server"
+msgstr "无效用户名"
 
-#: ../src/config.py:3101
-msgid "This account is already configured in Gajim."
-msgstr "此帐号已在 Gajim 中配置过。"
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "无效输入"
 
-#: ../src/config.py:3118
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:3119 ../src/config.py:3308
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6196,27 +6374,34 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3137
-#, fuzzy
-msgid "Invalid server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "注册新账户成功"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3138
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "必须提供用户名来配置此账户。"
+
+#: ../src/config.py:3214
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/config.py:3189 ../src/gajim.py:1996
+#: ../src/config.py:3270 ../src/gajim.py:2107
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "联系人已经在名单中"
 
-#: ../src/config.py:3190 ../src/gajim.py:1997
+#: ../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:3258
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6226,7 +6411,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3264 ../src/gajim.py:2020
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6234,106 +6419,148 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3287 ../src/config.py:3326
+#: ../src/config.py:3370 ../src/config.py:3393
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3307
-msgid "Your new account has been created successfully"
-msgstr "注册新账户成功"
-
-#: ../src/config.py:3410
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3411
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/conversation_textview.py:549
+#: ../src/config.py:3614
+msgid "Active"
+msgstr "活动"
+
+#: ../src/config.py:3622
+msgid "Event"
+msgstr "事件"
+
+#: ../src/config.py:3657
+msgid "First Message Received"
+msgstr "最初收到的消息"
+
+#: ../src/config.py:3658
+#, fuzzy
+msgid "Next Message Received Focused"
+msgstr "收到的下一条消息"
+
+#: ../src/config.py:3660
+#, fuzzy
+msgid "Next Message Received Unfocused"
+msgstr "收到的下一条消息"
+
+#: ../src/config.py:3661
+msgid "Contact Connected"
+msgstr "已连接的联系人"
+
+#: ../src/config.py:3662
+msgid "Contact Disconnected"
+msgstr "联系人已断开连接"
+
+#: ../src/config.py:3663
+msgid "Message Sent"
+msgstr "消息已发送"
+
+#: ../src/config.py:3664
+msgid "Group Chat Message Highlight"
+msgstr "群聊消息突出显示"
+
+#: ../src/config.py:3665
+msgid "Group Chat Message Received"
+msgstr "收到的群聊消息"
+
+#: ../src/config.py:3666
+msgid "GMail Email Received"
+msgstr "收到 GMail 邮件"
+
+#: ../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:568
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:678
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "退出(_Q)"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:690
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:695
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
-#: ../src/conversation_textview.py:712
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:725
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:728
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:734
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
-#: ../src/conversation_textview.py:973 ../src/conversation_textview.py:985
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr ""
-
-#: ../src/conversation_textview.py:1238
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1242
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1276
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
 
-#: ../src/dataforms_widget.py:540
+#: ../src/dataforms_widget.py:541
 #, fuzzy
 msgid "Jabber ID already in list"
 msgstr "Jabber 即时消息客户端"
 
-#: ../src/dataforms_widget.py:541
+#: ../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:552
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr ""
 
-#: ../src/dataforms_widget.py:555 ../src/dataforms_widget.py:557
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr ""
@@ -6348,148 +6575,148 @@ msgstr "联系人名称：<i>%s</i>"
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID： <i>%s</i>"
 
-#: ../src/dialogs.py:187
+#: ../src/dialogs.py:184
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:191
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:279
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:284
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:461
+#: ../src/dialogs.py:454
 #, fuzzy
 msgid "Set Mood"
 msgstr "设定 MOTD"
 
-#: ../src/dialogs.py:558
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:560
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:672
+#: ../src/dialogs.py:750
 #, fuzzy
 msgid "Overwrite Status Message?"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:673
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/dialogs.py:682
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "<b>保存为预设状态消息</b>"
 
-#: ../src/dialogs.py:683
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "请为该状态信息键入名称："
 
-#: ../src/dialogs.py:689
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM 地址："
 
-#: ../src/dialogs.py:690
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG 号码："
 
-#: ../src/dialogs.py:691
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ 号码："
 
-#: ../src/dialogs.py:692
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN 地址："
 
-#: ../src/dialogs.py:693
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址："
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:731
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:888 ../src/dialogs.py:894 ../src/dialogs.py:899
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:895
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:900
+#: ../src/dialogs.py:996
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:914
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:915
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:951
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "用户 ID："
 
-#: ../src/dialogs.py:1009
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本："
 
-#: ../src/dialogs.py:1011
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本："
 
-#: ../src/dialogs.py:1021
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "当前的开发者："
 
-#: ../src/dialogs.py:1023
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:1029
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "最后但不是最重要的，我们要特别感谢所有的软件维护人员。"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1048
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>"
 
-#: ../src/dialogs.py:1210
+#: ../src/dialogs.py:1306
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6499,369 +6726,394 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/dialogs.py:1614
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+#, fuzzy
+msgid "The nickname has not allowed characters."
+msgstr "群聊 Jabber ID 包含非法字符。"
+
+#: ../src/dialogs.py:1835
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:1617
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:1678 ../src/gajim.py:2617
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/dialogs.py:1686
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:1705
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1776
+#: ../src/dialogs.py:2001
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "无效用户名"
 
-#: ../src/dialogs.py:1777 ../src/groupchat_control.py:1453
-#: ../src/groupchat_control.py:1734
-#, fuzzy
-msgid "The nickname has not allowed characters."
-msgstr "群聊 Jabber ID 包含非法字符。"
-
-#: ../src/dialogs.py:1781 ../src/dialogs.py:1787
-#: ../src/groupchat_control.py:1901
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:1782 ../src/dialogs.py:1788
-#: ../src/groupchat_control.py:1902
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:1794
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "这不是一个群聊"
 
-#: ../src/dialogs.py:1795
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是群聊的名称。"
 
-#: ../src/dialogs.py:1822
+#: ../src/dialogs.py:2047
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:1836
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:1869
+#: ../src/dialogs.py:2094
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/dialogs.py:1870
+#: ../src/dialogs.py:2095
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:1894
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:1952
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:1954
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:1955
+#: ../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:"
 msgstr "填写您想发送聊天消息到的联系人 ID 或昵称："
 
 #. if offline or connecting
-#: ../src/dialogs.py:1979 ../src/dialogs.py:2353 ../src/dialogs.py:2496
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:1980 ../src/dialogs.py:2354 ../src/dialogs.py:2497
-#: ../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 "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:1989 ../src/dialogs.py:1992
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:1992
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2001
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2020
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
-#: ../src/dialogs.py:2024
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/dialogs.py:2025
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2064 ../src/notify.py:245 ../src/notify.py:459
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:2066 ../src/notify.py:253 ../src/notify.py:461
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#: ../src/dialogs.py:2068 ../src/notify.py:276 ../src/notify.py:463
-#: ../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 "新消息"
 
 #. single message
-#: ../src/dialogs.py:2068 ../src/notify.py:257 ../src/notify.py:463
-#: ../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 "新消息"
 
 #. private message
-#: ../src/dialogs.py:2069 ../src/notify.py:264 ../src/notify.py:464
-#: ../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 "新的个人消息"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1587 ../src/notify.py:472
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:2071 ../src/gajim.py:1653 ../src/notify.py:466
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:2073 ../src/gajim.py:1553 ../src/gajim.py:1620
-#: ../src/notify.py:468 ../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 "文件传输错误"
 
-#: ../src/dialogs.py:2075 ../src/gajim.py:1695 ../src/gajim.py:1717
-#: ../src/gajim.py:1734 ../src/notify.py:470 ../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 "文件传输完成"
 
-#: ../src/dialogs.py:2076 ../src/gajim.py:1698 ../src/notify.py:470
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2078 ../src/gajim.py:1445 ../src/notify.py:474
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:2080 ../src/notify.py:237 ../src/notify.py:476
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: ../src/dialogs.py:2272 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2274 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2276 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2279 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2302 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2325 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "来自 %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2397 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:2398 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:2442
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:2444
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#: ../src/dialogs.py:2568
+#. 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 "我想添加您到我的联系人名单"
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+msgid "Add"
+msgstr "地址"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "修改(_M)"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber ID"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "群组"
+
+#. 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 "我申请添加您到联系人名单"
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "私人列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:2628
+#: ../src/dialogs.py:3089
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序：%s，动作：%s，类型：%s，值：%s"
 
-#: ../src/dialogs.py:2633
+#: ../src/dialogs.py:3094
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序： %s，动作：%s"
 
-#: ../src/dialogs.py:2675
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:2762
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:2860
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "私人列表"
 
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "无效列表名"
 
-#: ../src/dialogs.py:2931
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个私人列表。"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3424
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "您被该群聊封禁。"
 
-#: ../src/dialogs.py:2966
+#: ../src/dialogs.py:3427
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:2968
+#: ../src/dialogs.py:3429
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:2976
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:2978
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3033
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:3043 ../src/dialogs.py:3094
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:3081
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:3099
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:3164
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:3166
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
 #. # means number
-#: ../src/dialogs.py:3237
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3243
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "条件"
 
-#: ../src/dialogs.py:3361
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "当我"
 
-#: ../src/dialogs.py:3836
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6869,38 +7121,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3840
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:3846 ../src/dialogs.py:3933
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:3854
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:3859
+#: ../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:3862 ../src/dialogs.py:3914 ../src/dialogs.py:3927
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:3869
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:3881
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:3882
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6910,374 +7162,397 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3883
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3915
+#: ../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:3921
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3928
+#: ../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:3934
+#: ../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 "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:656
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:657
+#: ../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."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: ../src/disco.py:661 ../src/disco.py:955
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:662
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:699 ../src/disco.py:709
+#: ../src/disco.py:702 ../src/disco.py:712
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "无效用户名"
 
-#: ../src/disco.py:754
+#: ../src/disco.py:759
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:794
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:956
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1179
+#: ../src/disco.py:1183
 #, fuzzy
 msgid "_Execute Command"
 msgstr "执行命令(_E)..."
 
-#: ../src/disco.py:1189 ../src/disco.py:1353
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1390
+#: ../src/disco.py:1396
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1572
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1580
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1588
+#: ../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 "书签已设定"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "群聊“%s”已在您的书签中。"
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "书签添加成功"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "您可以通过“动作”菜单管理您的名单。"
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 #, fuzzy
 msgid "Node"
 msgstr "无"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
-#: ../src/features_window.py:51
-msgid "PyOpenSSL"
+#: ../src/features_window.py:46
+msgid "SSL certificat validation"
 msgstr ""
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:53 ../src/features_window.py:54
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr ""
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr ""
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr ""
 
-#: ../src/features_window.py:59
-msgid "gajim-remote"
-msgstr ""
+#: ../src/features_window.py:54
+#, fuzzy
+msgid "Command line"
+msgstr "命令： %s "
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr ""
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:62 ../src/features_window.py:66
-#: ../src/features_window.py:70 ../src/features_window.py:74
-#: ../src/features_window.py:78 ../src/features_window.py:86
-#: ../src/features_window.py:90
+#: ../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 ""
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:58
 #, fuzzy
-msgid "OpenGPG"
-msgstr "OpenPGP: "
+msgid "OpenGPG message encryption"
+msgstr "OpenPGP 加密"
 
-#: ../src/features_window.py:64
-msgid "Encrypting chatmessages with gpg keys."
-msgstr ""
+#: ../src/features_window.py:59
+#, fuzzy
+msgid "Encrypting chat messages with gpg keys."
+msgstr "抵达的消息：(_I)"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr ""
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:62
 #, fuzzy
-msgid "network-manager"
+msgid "Network-manager"
 msgstr "历史管理器"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr ""
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr ""
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:66
 #, fuzzy
 msgid "Session Management"
 msgstr "消息已发送"
 
-#: ../src/features_window.py:72
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr ""
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr ""
 
-#: ../src/features_window.py:75
-msgid "gnome-keyring"
-msgstr ""
+#: ../src/features_window.py:70
+#, fuzzy
+msgid "Password encryption"
+msgstr "密码不符"
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr ""
 
-#: ../src/features_window.py:77
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr ""
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr ""
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr ""
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr ""
 
-#: ../src/features_window.py:85
-msgid ""
-"Requires python-gnome2-extras or compilation of gtkspell module from Gajim "
-"sources."
+#: ../src/features_window.py:80
+msgid "Requires libgtkspell."
 msgstr ""
 
-#: ../src/features_window.py:87
-msgid "Notification-daemon"
-msgstr ""
+#: ../src/features_window.py:82
+#, fuzzy
+msgid "Notification"
+msgstr "帐户修改"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr ""
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr ""
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr ""
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:90
 #, fuzzy
-msgid "Idle"
-msgstr "Id"
+msgid "Automatic status"
+msgstr "调整状态(_A)"
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:97 ../src/features_window.py:98
-msgid "Requires compilation of the idle module from Gajim sources."
+#: ../src/features_window.py:92
+msgid "Requires libxss library."
 msgstr ""
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:93
+msgid "Requires python2.5."
+msgstr ""
+
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr ""
 
-#: ../src/features_window.py:100
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr ""
 
-#: ../src/features_window.py:101
+#: ../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:102
+#: ../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:103
+#: ../src/features_window.py:98
 #, fuzzy
-msgid "End to End Encryption"
+msgid "End to End message encryption"
 msgstr "OpenPGP 加密"
 
-#: ../src/features_window.py:104
+#: ../src/features_window.py:99
 #, fuzzy
-msgid "Encrypting chatmessages."
+msgid "Encrypting chat messages."
 msgstr "抵达的消息：(_I)"
 
-#: ../src/features_window.py:105 ../src/features_window.py:106
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr ""
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:102
 #, fuzzy
 msgid "RST Generator"
 msgstr "常规"
 
-#: ../src/features_window.py:108
+#: ../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:109 ../src/features_window.py:110
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:111
-msgid "libsexy"
+#: ../src/features_window.py:106
+msgid "Banners and clickable links"
 msgstr ""
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:113 ../src/features_window.py:114
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr ""
 
-#: ../src/features_window.py:128
+#: ../src/features_window.py:123
 #, fuzzy
 msgid "Feature"
 msgstr "服务器设定"
@@ -7307,7 +7582,7 @@ msgstr "大小： %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:499
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "您"
 
@@ -7317,7 +7592,7 @@ msgid "Sender: %s"
 msgstr "发送者： %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "接收者： %s"
 
@@ -7351,27 +7626,27 @@ msgstr "错误消息：%s"
 
 #: ../src/filetransfers_window.py:231
 #, fuzzy
-msgid "File transfer stopped by the contact at the other end"
-msgstr "文件传输被对方中止"
+msgid "File transfer stopped"
+msgstr "文件传输已停止"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 #, fuzzy
 msgid "Description: "
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "文件： %s"
@@ -7391,33 +7666,33 @@ msgstr "描述： %s"
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:821
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:823
+#: ../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."
 msgstr "文件名已经存在且您没有权限覆盖它。"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:827
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "想做什么？"
 
 #. 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:834
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:835
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
@@ -7453,73 +7728,73 @@ msgstr "文件："
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "发送者："
 
-#: ../src/filetransfers_window.py:782
+#: ../src/filetransfers_window.py:781
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim.py:83
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr ""
-
-#: ../src/gajim.py:156
+#: ../src/gajim.py:139
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "运行 Gajim 需要 X 服务器。退出..."
 
-#: ../src/gajim.py:186
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above"
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:187
+#: ../src/gajim.py:171
 #, fuzzy
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:189
+#: ../src/gajim.py:173
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above"
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:190
+#: ../src/gajim.py:174
 #, fuzzy
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:195
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
-#: ../src/gajim.py:197
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
-#: ../src/gajim.py:212
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "运行 Gajim 需要 pywin32"
 
-#: ../src/gajim.py:213
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7527,11 +7802,11 @@ msgid ""
 msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:366
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:367
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7539,25 +7814,34 @@ msgstr ""
 "Gajim 另一个实例似乎正在运行 \n"
 "运行？"
 
-#: ../src/gajim.py:493
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gajim.py:494
+#: ../src/gajim.py:429
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "为账户 %s 输入 GPG 密文字段"
 
+#: ../src/gajim.py:443
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gajim.py:444
+#, fuzzy, python-format
+msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
 #. ask again
-#: ../src/gajim.py:509
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
-#: ../src/gajim.py:557
+#: ../src/gajim.py:512
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7567,146 +7851,182 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/gajim.py:571
+#: ../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 "是否接受这个请求？"
 
-#: ../src/gajim.py:573
+#: ../src/gajim.py:534
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:576
+#: ../src/gajim.py:537
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gajim.py:624 ../src/notify.py:478 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gajim.py:930 ../src/gajim.py:934
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, fuzzy, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "%(nickname)s： %(message)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:944 ../src/gajim.py:957
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gajim.py:989
+#: ../src/gajim.py:970 ../src/notify.py:513
+#, fuzzy
+msgid "Subscription request"
+msgstr "认证请求"
+
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:990
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:1010
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:1051
+#: ../src/gajim.py:1034 ../src/notify.py:515
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "退订(_S)"
+
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:1227 ../src/groupchat_control.py:1164
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/gajim.py:1245 ../src/groupchat_control.py:1339
-#: ../src/history_window.py:417 ../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 的状态是 %(status)s"
 
-#: ../src/gajim.py:1308
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
 #. 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:1372 ../src/groupchat_control.py:1124
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1375
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gajim.py:1377
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gajim.py:1380
+#: ../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:1383
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gajim.py:1385
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gajim.py:1387
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1390
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1393
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1425
+#: ../src/gajim.py:1466
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "该群聊要求密码才能加入。"
 
-#: ../src/gajim.py:1459
+#: ../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"
 msgstr ""
 
-#: ../src/gajim.py:1461
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gajim.py:1464
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gajim.py:1564
+#: ../src/gajim.py:1528
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../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: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 "不再提问此问题(_N)"
+
+#: ../src/gajim.py:1540
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gajim.py:1566
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#: ../src/gajim.py:1579
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7716,82 +8036,92 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gajim.py:1650
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gajim.py:1718
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "从名单移除联系人"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "读文件错误："
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1722
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1735
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gajim.py:1739
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gajim.py:1823
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1830
+#: ../src/gajim.py:1933
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "对于每条消息(_M)"
 
-#: ../src/gajim.py:1901
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gajim.py:1902
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
-#: ../src/gajim.py:1914
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gajim.py:1927
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gajim.py:1938
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr ""
 
-#: ../src/gajim.py:1963
+#: ../src/gajim.py:2069
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gajim.py:1964
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gajim.py:2017
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gajim.py:2018
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7799,195 +8129,178 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gajim.py:2023
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gajim.py:2038
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gajim.py:2039
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
-"It seems the SSL certificate has changed or your connection is being "
-"hacked.\n"
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
 "Old fingerprint: %(old)s\n"
 "New fingerprint: %(new)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gajim.py:2061 ../src/gajim.py:2091
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 #, fuzzy
 msgid "Insecure connection"
 msgstr "连接"
 
-#: ../src/gajim.py:2062
+#: ../src/gajim.py:2187
 #, fuzzy
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/gajim.py:2064 ../src/gajim.py:2094
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gajim.py:2065 ../src/gajim.py:2095 ../src/groupchat_control.py:1843
-#: ../src/roster_window.py:3790
-msgid "Do _not ask me again"
-msgstr "不再提问此问题(_N)"
-
-#: ../src/gajim.py:2092
+#: ../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?"
 msgstr ""
 
-#: ../src/gajim.py:2109
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2110
+#: ../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:2575 ../src/gajim.py:2596
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "禁用加密"
 
-#: ../src/gajim.py:2576
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2597
+#: ../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:2623 ../src/roster_window.py:3324
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入群聊"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:2903
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gajim.py:3000
-msgid "Bookmark already set"
-msgstr "书签已设定"
-
-#: ../src/gajim.py:3001
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "群聊“%s”已在您的书签中。"
-
-#: ../src/gajim.py:3014
-msgid "Bookmark has been added successfully"
-msgstr "书签添加成功"
-
-#: ../src/gajim.py:3015
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "您可以通过“动作”菜单管理您的名单。"
-
-#: ../src/gajim-remote.py:79
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:83
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote.py:87
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:91
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "为下一条未读消息弹出窗口"
 
-#: ../src/gajim-remote.py:95
+#: ../src/gajim-remote.py:94
 #, fuzzy
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:150 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:180 ../src/gajim-remote.py:210
-#: ../src/gajim-remote.py:219 ../src/gajim-remote.py:226
-#: ../src/gajim-remote.py:233 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:260 ../src/gajim-remote.py:270
+#: ../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:273
 msgid "account"
 msgstr "账户"
 
-#: ../src/gajim-remote.py:98
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote.py:104
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote.py:108
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "状态"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:158
+#: ../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 "消息"
 
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote.py:113
+#: ../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"
 msgstr "改变账户的状态。如果不指明，将改变设置“与全局同步”选项的账户"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "显示对话框用于给联系人发送消息"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
+#: ../src/gajim-remote.py:130
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -7996,29 +8309,29 @@ msgstr ""
 "发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:145
+#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:147
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160
 msgid "message contents"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "pgp key"
 msgstr "PGP 钥匙"
 
-#: ../src/gajim-remote.py:134 ../src/gajim-remote.py:148
+#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:150
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:138 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:161
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，消息将被用此账户发送"
 
-#: ../src/gajim-remote.py:141
+#: ../src/gajim-remote.py:143
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8027,210 +8340,215 @@ msgstr ""
 "发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
 "不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote.py:146
+#: ../src/gajim-remote.py:148
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote.py:155
+#: ../src/gajim-remote.py:157
 msgid "Sends new message to a groupchat you've joined."
 msgstr ""
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 #, fuzzy
 msgid "JID of the room that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote.py:164
+#: ../src/gajim-remote.py:166
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:166 ../src/gajim-remote.py:179
-#: ../src/gajim-remote.py:209 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:168 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:211 ../src/gajim-remote.py:220
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:172
 msgid "Gets detailed info on a account"
 msgstr "获得帐号的详细信息"
 
-#: ../src/gajim-remote.py:172
+#: ../src/gajim-remote.py:174
 msgid "Name of the account"
 msgstr "帐号名称"
 
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:178
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote.py:178
+#: ../src/gajim-remote.py:180
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote.py:180
+#: ../src/gajim-remote.py:182
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，文件将被用此账户发送"
 
-#: ../src/gajim-remote.py:185
+#: ../src/gajim-remote.py:187
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "Sets value of 'key' to 'value'."
 msgstr "将“密钥”的值设为“值”"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "“密钥”是参数名，而“值”是赋予参数的数值"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote.py:198
+#: ../src/gajim-remote.py:200
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Removes contact from roster"
 msgstr "从名单移除联系人"
 
-#: ../src/gajim-remote.py:216
+#: ../src/gajim-remote.py:218
 msgid "Adds contact to roster"
 msgstr "向名单添加联系人"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "jid"
 msgstr "JID"
 
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:221
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人"
 
-#: ../src/gajim-remote.py:224
+#: ../src/gajim-remote.py:226
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:233
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:238
+#: ../src/gajim-remote.py:240
 #, fuzzy
 msgid "Returns number of unread messages"
 msgstr "未读消息的回复总数"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid "Opens 'Start Chat' dialog"
 msgstr "打开 '开始聊天' 对话框"
 
-#: ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:246
 msgid "Starts chat, using this account"
 msgstr "开始聊天，使用这个账户"
 
-#: ../src/gajim-remote.py:248
+#: ../src/gajim-remote.py:250
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:252
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: ../src/gajim-remote.py:251
+#: ../src/gajim-remote.py:253
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
-#: ../src/gajim-remote.py:257
+#: ../src/gajim-remote.py:259
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:262
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:265
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "消息内容"
+
+#: ../src/gajim-remote.py:268
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "加入新房间(_J)"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "room"
 msgstr "来自"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:270
 #, fuzzy
 msgid "Room JID"
 msgstr "房间："
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "nick"
 msgstr "昵称"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:271
 #, fuzzy
 msgid "Nickname to use"
 msgstr "昵称未找到： %s "
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "password"
 msgstr "密码："
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:272
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "密码不符"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:275
+#: ../src/gajim-remote.py:278
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:306
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:325
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8239,31 +8557,31 @@ msgstr ""
 "\"%s\" 不在您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:328
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:380
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:421
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8272,7 +8590,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:483
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8281,7 +8599,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:488
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8290,7 +8608,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "错误主机"
@@ -8309,213 +8627,215 @@ msgid "Please create a clean new theme with your desired name."
 msgstr ""
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "主题名称"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "无法删除当前主题"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:150
+#: ../src/groupchat_control.py:152
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:152
+#: ../src/groupchat_control.py:154
 #, fuzzy, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在群聊“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_control.py:451
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:603
+#: ../src/groupchat_control.py:561
 #, fuzzy
 msgid "Conversation with "
 msgstr "对话历史"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:563
 #, fuzzy
 msgid "Continued conversation"
 msgstr "连接"
 
-#: ../src/groupchat_control.py:1027
-msgid "Really send file?"
-msgstr ""
-
-#: ../src/groupchat_control.py:1028
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1127
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1139
 #, fuzzy
 msgid "A new room has been created"
 msgstr "注册新账户成功"
 
-#: ../src/groupchat_control.py:1132
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1138
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1142
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1149
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1153
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1162
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:1200 ../src/groupchat_control.py:1204
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, fuzzy, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1201
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "会籍："
 
-#: ../src/groupchat_control.py:1206
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1280
+#: ../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:1284
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1299
+#: ../src/groupchat_control.py:1318
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "%(nick)s 被 %(who)s 踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1303
+#: ../src/groupchat_control.py:1322
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1452 ../src/groupchat_control.py:1733
-#, fuzzy
-msgid "Invalid nickname"
-msgstr "无效用户名"
-
-#: ../src/groupchat_control.py:1476 ../src/groupchat_control.py:1494
-#: ../src/groupchat_control.py:1578 ../src/groupchat_control.py:1595
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_control.py:1510
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "这个群聊没有主题"
 
-#: ../src/groupchat_control.py:1521
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
 
-#: ../src/groupchat_control.py:1656
+#: ../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 "昵称未找到： %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 ""
 "用法：/%s <昵称|JID> [原因]，从此群聊封禁 JID。昵称可能被代替，除了包含“@”。"
 "如果 JID 在群聊里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_control.py:1663
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
 "occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_control.py:1669
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_control.py:1675
+#: ../src/groupchat_control.py:1746
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
 "providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前群聊，可以提供一个原因。"
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_control.py:1683
-#, 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 ""
 "用法：/%s <昵称> [原因]，通过昵称移除群聊房主，原因可选。注意：不支持含空格的"
 "昵称。"
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8523,81 +8843,95 @@ msgid ""
 msgstr ""
 "用法： /%s <昵称> [消息], 打开一个私聊窗口并且向指定昵称的联系人发送消息 "
 
-#: ../src/groupchat_control.py:1697
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "用法：/%s <昵称>，在当前群聊中改变昵称。"
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "用法：/%s [主题]，显示或更新群聊的拥有者。"
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr "用法：/%s [主题]，显示或更新当前群聊的主题。"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_control.py:1837
+#: ../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 "用法：/%s <昵称>，在当前群聊中改变昵称。"
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1839
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1876
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1877
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1881
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1908
+#: ../src/groupchat_control.py:1977
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "描述： %s"
 
-#: ../src/groupchat_control.py:1909
+#: ../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:1911
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2083
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:2084 ../src/groupchat_control.py:2388
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:2387
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -8626,81 +8960,81 @@ msgstr "细节"
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. 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 "不能写入到 %s 。会话管理支持功能未启用"
 
 #. 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 ""
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "确认覆盖该文件？"
 
-#: ../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 ""
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../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 "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s？"
 
-#: ../src/gtkgui_helpers.py:844
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
-#: ../src/history_manager.py:97
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
 #. holds jid
-#: ../src/history_manager.py:137
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "联系人"
 
 #. holds time
-#: ../src/history_manager.py:150 ../src/history_manager.py:190
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:156 ../src/history_manager.py:208
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:164 ../src/history_manager.py:196
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "消息"
 
-#: ../src/history_manager.py:224
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库？（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: ../src/history_manager.py:226
+#: ../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 "
@@ -8713,265 +9047,282 @@ msgstr ""
 "\n"
 "如果您点击“是”，请等待..."
 
-#: ../src/history_manager.py:437
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:512
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说： %(message)s\n"
 
-#: ../src/history_manager.py:549
+#: ../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] "您确定要删除所选定联系人的历史记录？"
 
-#: ../src/history_manager.py:553 ../src/history_manager.py:588
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:585
+#: ../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] "您确定要删除所选定的消息？"
 
-#: ../src/history_window.py:287
+#: ../src/history_window.py:298
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:332
+#: ../src/history_window.py:343
 msgid "Disk Error"
 msgstr ""
 
-#: ../src/history_window.py:413
+#: ../src/history_window.py:424
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:423
+#: ../src/history_window.py:434
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态：%(status)s：%(status_msg)s"
 
-#: ../src/history_window.py:426
+#: ../src/history_window.py:437
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/htmltextview.py:591 ../src/htmltextview.py:602
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "无法读取图片"
 
-#: ../src/htmltextview.py:612
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:446
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "尚未连接到服务器"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "您确定要删除所选定的消息？"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:448
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/message_window.py:450
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:456
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "消息"
 
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:32
 msgid "- messages will be logged"
 msgstr ""
 
-#: ../src/negotiation.py:36
+#: ../src/negotiation.py:34
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 状态改变"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "来自群聊 %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
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/osx/growler.py:10
+#: ../src/notify.py:555
 #, fuzzy
-msgid "Generic"
-msgstr "常规"
+msgid "Ignore"
+msgstr "九"
 
-#: ../src/profile_window.py:56
+#: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "取回概况..."
 
-#: ../src/profile_window.py:109 ../src/roster_window.py:2787
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 #, fuzzy
 msgid "File is empty"
 msgstr "文件路径"
 
-#: ../src/profile_window.py:112 ../src/roster_window.py:2790
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 #, fuzzy
 msgid "File does not exist"
 msgstr "不存在这样的群聊"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:126 ../src/profile_window.py:142
-#: ../src/roster_window.py:2792 ../src/roster_window.py:2803
+#: ../src/profile_window.py:125 ../src/profile_window.py:141
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:252
+#: ../src/profile_window.py:251
 msgid "Information received"
 msgstr "收到信息"
 
-#: ../src/profile_window.py:321
+#: ../src/profile_window.py:318
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/profile_window.py:335
+#: ../src/profile_window.py:332
 msgid "Sending profile..."
 msgstr "发送概况..."
 
-#: ../src/profile_window.py:350
+#: ../src/profile_window.py:347
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: ../src/profile_window.py:357
+#: ../src/profile_window.py:354
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:358
+#: ../src/profile_window.py:355
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/roster_window.py:288 ../src/roster_window.py:945
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1860
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1861
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1881
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1882
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1920
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\t\t\t\tcorrectly started "
-"(environment variable probably not \t\t\t\t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/roster_window.py:1930 ../src/roster_window.py:1950
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:2119 ../src/roster_window.py:3267
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:2120 ../src/roster_window.py:3268
+#: ../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?"
 msgstr "隐身将从所有群聊中断开。确定隐身？"
 
-#: ../src/roster_window.py:2146
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2284 ../src/roster_window.py:2521
+#: ../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 "确定要离开房间“ %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 "您有未读消息"
 
-#: ../src/roster_window.py:2285
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:2522
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "移除代理前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:2525
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:2526
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:2529
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2534
+#: ../src/roster_window.py:2583
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -8979,79 +9330,84 @@ msgid ""
 msgstr "您将无法从这些代理的联系人收发消息：%s"
 
 #. it's jid
-#: ../src/roster_window.py:2668
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2669
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2676
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2677
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2733
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从名单中删除组 %s ?"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从名单移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2774
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:2775
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:3128
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:3132
+#: ../src/roster_window.py:3174
+#, python-format
+msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
+msgstr ""
+
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证，导致他/她将一直看到您为离线。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3137
+#: ../src/roster_window.py:3185
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "想做什么？"
 
-#: ../src/roster_window.py:3141
+#: ../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."
 msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:3144
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3148
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的名单中移除"
 
-#: ../src/roster_window.py:3152
+#: ../src/roster_window.py:3200
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9060,19 +9416,19 @@ msgstr ""
 "移除这些联系人：%s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3191
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3192
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:3708
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持元联系人存储"
 
-#: ../src/roster_window.py:3710
+#: ../src/roster_window.py:3815
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9080,12 +9436,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
 
-#: ../src/roster_window.py:3784
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3786
+#: ../src/roster_window.py:3902
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9095,148 +9451,149 @@ msgstr ""
 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
 "或代理账户时。"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "无效文件"
 
-#: ../src/roster_window.py:3910
+#: ../src/roster_window.py:4026
 #, fuzzy, 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] "%s 想发送给您一个文件："
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "发送 %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "创建 %s 和 %s 元联系人"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4587 ../src/roster_window.py:4658
-#: ../src/roster_window.py:4667 ../src/systray.py:243 ../src/systray.py:254
-#: ../src/systray.py:266
+#: ../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 "使用账户 %s"
 
 #. add
-#: ../src/roster_window.py:4674
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:4679
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:4716 ../src/systray.py:303
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "书签管理(_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4736
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:4776
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:4838 ../src/roster_window.py:4947
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:4865
+#: ../src/roster_window.py:4992
 #, fuzzy
 msgid "Publish Tune"
 msgstr "发布(_P)"
 
-#: ../src/roster_window.py:4873
-msgid "Mood"
-msgstr ""
-
-#: ../src/roster_window.py:4879
-#, fuzzy
-msgid "Activity"
-msgstr "活动"
-
-#: ../src/roster_window.py:4884
+#: ../src/roster_window.py:5000
 #, fuzzy
 msgid "Configure Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/roster_window.py:5035
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr ""
 
 #. Send Group Message
-#: ../src/roster_window.py:5043 ../src/roster_window.py:5568
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5051
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5055
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "向所有在线用户"
 
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5588
+#: ../src/roster_window.py:5708
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "重命名联系人"
 
 #. Send single message
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5769
 #, fuzzy
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5705
+#: ../src/roster_window.py:5825
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "代理"
 
 #. Modify Transport
-#: ../src/roster_window.py:5713
+#: ../src/roster_window.py:5833
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "显示代理(_P)"
 
-#: ../src/roster_window.py:5788
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5795
+#: ../src/roster_window.py:5914
 #, fuzzy
 msgid "_Disconnect"
 msgstr "联系人已断开连接"
 
-#: ../src/roster_window.py:5875
+#: ../src/roster_window.py:5994
 #, fuzzy
 msgid "_New Group Chat"
 msgstr "新群聊"
 
 #. History manager
-#: ../src/roster_window.py:5988
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:5997 ../src/systray.py:341
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "加入新群聊(_J)"
 
-#: ../src/roster_window.py:6207
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
@@ -9253,20 +9610,20 @@ msgstr ""
 msgid "No result"
 msgstr ""
 
-#: ../src/session.py:124
+#: ../src/session.py:123
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "主题：%s"
 
-#: ../src/session.py:398 ../src/session.py:433
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr ""
 
-#: ../src/session.py:400
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9276,7 +9633,7 @@ msgid ""
 "\tAre these options acceptable?"
 msgstr ""
 
-#: ../src/session.py:434
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9286,129 +9643,119 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/systray.py:188
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/systray.py:322
+#: ../src/systray.py:293
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../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 "资源："
 
-#: ../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"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "状态"
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "最后状态：%s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr "自从 %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 #, fuzzy
 msgid "Connected"
 msgstr "连接"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 #, fuzzy
 msgid "Disconnected"
 msgstr "联系人已断开连接"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "认证："
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-#, fuzzy
-msgid "Mood:"
-msgstr "房间："
-
-#: ../src/tooltips.py:602
-#, fuzzy
-msgid "Activity:"
-msgstr "活动"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 #, fuzzy
 msgid "Tune:"
 msgstr "类型："
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "类型"
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../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"
@@ -9424,53 +9771,116 @@ msgstr "?Client: 未知"
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:272 ../src/vcard.py:282 ../src/vcard.py:482
+#: ../src/vcard.py:268
+#, fuzzy
+msgid "?Time:Unknown"
+msgstr "?Client: 未知"
+
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:311
+#: ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>应用</b>"
 
-#: ../src/vcard.py:319
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:321
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:323
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:325
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:334
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:339 ../src/vcard.py:377 ../src/vcard.py:507
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#~ msgid "OpenPGP Encryption"
-#~ msgstr "OpenPGP 加密"
+#~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
+#~ msgstr "点击查看 jabber 服务器特性(如 MSN, ICQ 代理)"
+
+#~ msgid "Servers Features"
+#~ msgstr "服务器设定"
+
+#~ msgid "Your JID:"
+#~ msgstr "您的 JID："
+
+#~ msgid "Name:"
+#~ msgstr "名称："
+
+#~ msgid "_Host:"
+#~ msgstr "主机(_H)："
+
+#, fuzzy
+#~ msgid "Show _roster"
+#~ msgstr "显示名单(_R)"
+
+#~ msgid "Modify Account"
+#~ msgstr "修改帐户"
+
+#, fuzzy
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr "\"%(title)s\" %(artist)s"
+
+#~ msgid "Gajim account %s"
+#~ msgstr "Gajim 帐户 %s"
+
+#, fuzzy
+#~ msgid "Custom"
+#~ msgstr "<b>自定义</b>"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "复制 Jabber ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "此帐号已在 Gajim 中配置过。"
+
+#, fuzzy
+#~ msgid "OpenGPG"
+#~ msgstr "OpenPGP: "
+
+#, fuzzy
+#~ msgid "Idle"
+#~ msgstr "Id"
+
+#, fuzzy
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "文件传输被对方中止"
+
+#, fuzzy
+#~ msgid "Generic"
+#~ msgstr "常规"
+
+#, fuzzy
+#~ msgid "Activity"
+#~ msgstr "活动"
 
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr " %s 没有广播 OpenPGP 公钥或您未指定"
@@ -9493,9 +9903,6 @@ msgstr "带有优先级的资源"
 #~ msgid "_Retype Password:"
 #~ msgstr "重新键入密码：(_R)"
 
-#~ msgid "_Use proxy"
-#~ msgstr "使用代理服务器(_U)"
-
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9655,9 +10062,6 @@ msgstr "带有优先级的资源"
 #~ msgid "_Before time:"
 #~ msgstr "在该时间前：(_B)"
 
-#~ msgid "_Font:"
-#~ msgstr "字号：(_F)"
-
 #~ msgid "_Never"
 #~ msgstr "从不(_N)"
 
@@ -9670,9 +10074,6 @@ msgstr "带有优先级的资源"
 #~ msgid "_Pop it up"
 #~ msgstr "弹出(_P)"
 
-#~ msgid "_URL:"
-#~ msgstr "URL：(_U)"
-
 #~ msgid "Address"
 #~ msgstr "地址"
 
@@ -9812,9 +10213,6 @@ msgstr "带有优先级的资源"
 #~ msgid "Drop %s in group %s"
 #~ msgstr "将 %s 放在群 %s 中"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "创建 %s 和 %s 元联系人"
-
 #~ msgid "Affiliation:"
 #~ msgstr "关系："
 
@@ -9845,9 +10243,6 @@ msgstr "带有优先级的资源"
 #~ msgid_plural " %d unread private messages"
 #~ msgstr[0] " %d 未读私人消息"
 
-#~ msgid "gtk+"
-#~ msgstr "gtk+"
-
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "到主机的连接无法建立：服务器应答不正确。"
@@ -9868,9 +10263,6 @@ msgstr "带有优先级的资源"
 #~ "MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真"
 #~ "的时候对生效)"
 
-#~ msgid "Add"
-#~ msgstr "地址"
-
 #~ msgid "Away "
 #~ msgstr "离开"
 
@@ -9892,9 +10284,6 @@ msgstr "带有优先级的资源"
 #~ msgid "Invalid room or server name"
 #~ msgstr "无效房间或服务器名"
 
-#~ msgid "vCard publication succeeded"
-#~ msgstr " vCard 发布成功"
-
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "您的个人信息被成功发布。"
 
@@ -9953,9 +10342,6 @@ msgstr "带有优先级的资源"
 #~ msgid "%s has sent you a new message."
 #~ msgstr "%s 给您发送了一条新消息。"
 
-#~ msgid "GUI Migration failed"
-#~ msgstr "vCard 发布失败"
-
 #~ msgid "Logs have been successfully migrated to the database."
 #~ msgstr "日志被成功移动到数据库。"
 
@@ -10019,9 +10405,6 @@ msgstr "带有优先级的资源"
 #~ msgid "At least one contact group must be present."
 #~ msgstr "至少保留一个联系群组"
 
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "确定要离开房间“ %s ”？"
-
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr "如果关闭此窗口，您将断开这些房间的连接。"
 
diff --git a/src/common/fuzzyclock.py b/src/common/fuzzyclock.py
index 60c108105..fc285fd8f 100755
--- a/src/common/fuzzyclock.py
+++ b/src/common/fuzzyclock.py
@@ -4,6 +4,7 @@
 ## Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net>
 ## Copyright (C) 2006-2007 Yann Leboulanger <asterix AT lagaule.org>
 ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org>
+## Copyright (C) 2009 Benjamin Richter <br AT waldteufel-online.net>
 ##
 ## This file is part of Gajim.
 ##
@@ -22,10 +23,10 @@
 
 '''
 Python class to show a "fuzzy clock".
-Homepage: http://home.gna.org/fuzzyclock/
-Project Page: http://gna.org/projects/fuzzyclock
+Homepage of the original: http://home.gna.org/fuzzyclock/
+Project Page of the original: http://gna.org/projects/fuzzyclock
 
-The class has been ported from PHP code by
+The class is based on a port from PHP code by
 Henrique Recidive <henrique at recidive.com> which was
 in turn based on the Fuzzy Clock Applet of Frerich Raabe (KDE).
 So most of the credit goes to this guys, thanks :-)
@@ -34,105 +35,39 @@ So most of the credit goes to this guys, thanks :-)
 import time
 
 class FuzzyClock:
-	def __init__(self):
-		self.__hour = 0
-		self.__minute = 0
-		self.__dayOfWeek = 0
+	HOUR_NAMES = [ _('twelve'), _('one'), _('two'), _('three'), _('four'),
+		_('five'), _('six'), _('seven'), _('eight'), _('nine'), _('ten'),
+		_('eleven') ]
 
-		self.__hourNames = [ _('one'), _('two'), _('three'), _('four'), _('five'), _('six'),
-			_('seven'), _('eight'), _('nine'), _('ten'), _('eleven'),
-			_('twelve')]
+	#Strings to use for the output. %(0)s will be replaced with the preceding hour
+	#(e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
+	FUZZY_TIME = [ _("%(0)s o'clock"), _('five past %(0)s'), _('ten past %(0)s'),
+		_('quarter past %(0)s'), _('twenty past %(0)s'), _('twenty five past %(0)s'),
+		_('half past %(0)s'), _('twenty five to %(1)s'), _('twenty to %(1)s'),
+		_('quarter to %(1)s'), _('ten to %(1)s'), _('five to %(1)s'), _("%(1)s o'clock") ]
 
-		#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). '''
-		self.__normalFuzzy = [ _("$0 o'clock"), _('five past $0'),
-			_('ten past $0'), _('quarter past $0'),
-			_('twenty past $0'), _('twenty five past $0'),
-			_('half past $0'), _('twenty five to $1'),
-			_('twenty to $1'), _('quarter to $1'),
-			_('ten to $1'), _('five to $1'), _("$1 o'clock") ]
+	FUZZY_DAYTIME = [ _('Night'), _('Early morning'), _('Morning'), 
+		_('Almost noon'), _('Noon'), _('Afternoon'), _('Evening'),
+		_('Late evening'), _('Night') ]
 
-		#A "singular-form". It is used when talking about hour 0
-		self.__normalFuzzyOne = [ _("$0 o'clock"), _('five past $0'),
-			_('ten past $0'), _('quarter past $0'),
-			_('twenty past $0'), _('twenty five past $0'),
-			_('half past $0'), _('twenty five to $1'),
-			_('twenty to $1'), _('quarter to $1'),
-			_('ten to $1'), _('five to $1'),
-			_("$1 o'clock") ]
-
-
-		self.__dayTime = [ _('Night'), _('Early morning'), _('Morning'), _('Almost noon'),
-			_('Noon'), _('Afternoon'), _('Evening'), _('Late evening') ]
-
-		self.__fuzzyWeek = [ _('Start of week'), _('Middle of week'), _('End of week'),
-			_('Weekend!') ]
-
-		self.setCurrent()
-
-	def setHour(self,hour):
-		self.__hour = int(hour)
-
-	def setMinute(self,minute):
-		self.__minute=int(minute)
-
-	def setDayOfWeek(self,day):
-		self.__dayOfWeek=int(day)
-
-	def setTime(self,time):
-		timeArray = time.split(":")
-		self.setHour(timeArray[0])
-		self.setMinute(timeArray[1])
-
-	def setCurrent(self):
-		hour=time.strftime("%H")
-		minute=time.strftime("%M")
-		day=time.strftime("%w")
-
-		self.setTime(hour+":"+minute)
-		self.setDayOfWeek(day)
-
-	def getFuzzyTime(self, fuzzyness = 1):
-		sector = 0
-		realHour = 0
+	FUZZY_WEEK = [ _('Start of week'), _('Middle of week'), _('Middle of week'),
+		_('Middle of week'), _('End of week'), _('Weekend!'), _('Weekend!') ]
 
+	def fuzzy_time(self, fuzzyness, now):
 		if fuzzyness == 1 or fuzzyness == 2:
 			if fuzzyness == 1:
-				if self.__minute >2:
-					sector = (self.__minute - 3) / 5 +1
-			else:
-				if self.__minute > 6:
-					sector = ((self.__minute - 7) / 15 + 1) * 3
-
-			newTimeStr = self.__normalFuzzy[sector]
-			#$0 or $1?
-			deltaHour = int(newTimeStr[newTimeStr.find("$")+1])
-
-			if (self.__hour + deltaHour) % 12 > 0:
-				realHour = (self.__hour + deltaHour) % 12 - 1
+				sector = int(round(now.tm_min / 5.0))
 			else:
-				realHour = 12 - ((self.__hour + deltaHour) % 12 + 1)
-
-			if realHour == 0:
-				newTimeStr = self.__normalFuzzyOne[sector]
-
-			newTimeStr = newTimeStr.replace("$"+str(deltaHour),
-				self.__hourNames[realHour])
+				sector = int(round(now.tm_min / 15.0)) * 3
 
+			return self.FUZZY_TIME[sector] % {
+				'0': self.HOUR_NAMES[now.tm_hour % 12],
+				'1': self.HOUR_NAMES[(now.tm_hour + 1) % 12]}
 
 		elif fuzzyness == 3:
-			newTimeStr = self.__dayTime[self.__hour / 3]
+			return self.FUZZY_DAYTIME[int(round(now.tm_hour / 3.0))]
 
 		else:
-			dayOfWeek = self.__dayOfWeek
-			if dayOfWeek == 1:
-				newTimeStr = self.__fuzzyWeek[0]
-			elif dayOfWeek >= 2 and dayOfWeek <= 4:
-				newTimeStr = self.__fuzzyWeek[1]
-			elif dayOfWeek == 5:
-				newTimeStr = self.__fuzzyWeek[2]
-			else:
-				newTimeStr = self.__fuzzyWeek[3]
-
-		return newTimeStr
+			return self.FUZZY_WEEK[now.tm_wday]
 
 # vim: se ts=3:
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 5d91ca05f..68bb8633b 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -179,6 +179,9 @@ class ConversationTextview(gobject.GObject):
 		gobject.GObject.__init__(self)
 		self.used_in_history_window = used_in_history_window
 
+		self.fc = FuzzyClock()
+
+
 		# no need to inherit TextView, use it as atrribute is safer
 		self.tv = HtmlTextView()
 		self.tv.html_hyperlink_handler = self.html_hyperlink_handler
@@ -1178,9 +1181,7 @@ class ConversationTextview(gobject.GObject):
 				self.last_time_printout = time.mktime(tim)
 				end_iter = buffer_.get_end_iter()
 				if gajim.config.get('print_time_fuzzy') > 0:
-					fc = FuzzyClock()
-					fc.setTime(time.strftime('%H:%M', tim))
-					ft = fc.getFuzzyTime(gajim.config.get('print_time_fuzzy'))
+					ft = self.fc.fuzzy_time(gajim.config.get('print_time_fuzzy'), tim)
 					tim_format = ft.decode(locale.getpreferredencoding())
 				else:
 					tim_format = self.get_time_to_show(tim)